moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

asyn-thread: fix cppcheck warning

Browse Source 
- Check for NULL entry parameter before attempting to deref entry in
  Curl_resolver_is_resolved, like is already done in asyn-ares.

This is to silence cppcheck which does not seem to understand that
asyn-ares and asyn-thread have separate Curl_resolver_is_resolved
and those units are mutually exclusive. Prior to this change it warned
of a scenario where asyn-thread's Curl_resolver_is_resolved is called
with a NULL entry from asyn-ares, but that couldn't happen.

Reported-by: rl1987@users.noreply.github.com

Fixes https://github.com/curl/curl/issues/5326
This commit is contained in:
Jay Satiro 2020-05-02 14:53:09 -04:00
parent 85eda4e87a
commit 153d581b7f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/asyn-thread.c
View File

@ -593,7 +593,8 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
struct thread_data *td = (struct thread_data*) conn->async.os_specific;
int done = 0;
*entry = NULL;
if(entry)
*entry = NULL;
if(!td) {
DEBUGASSERT(td);
@ -613,7 +614,8 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
return result;
}
destroy_async_data(&conn->async);
*entry = conn->async.dns;
if(entry)
*entry = conn->async.dns;
}
else {
/* poll for name lookup done with exponential backoff up to 250ms */