diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2015-03-11 17:41:01 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-03-16 12:13:56 +0100 |
| commit | 29c655c0a6affc0359e499162e8308663eb4d04f (patch) | |
| tree | ed6b1fc761dee6623ec1b312cc53dc3b661c1550 /lib/formdata.c | |
| parent | 059b3a5770075315dbc843b9285a1cdec82c12d5 (diff) | |
| download | curl-29c655c0a6affc0359e499162e8308663eb4d04f.tar.gz | |
Bug #149: Deletion of unnecessary checks before calls of the function "free"
The function "free" is documented in the way that no action shall occur for
a passed null pointer. It is therefore not needed that a function caller
repeats a corresponding check.
http://stackoverflow.com/questions/18775608/free-a-null-pointer-anyway-or-check-first
This issue was fixed by using the software Coccinelle 1.0.0-rc24.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Diffstat (limited to 'lib/formdata.c')
| -rw-r--r-- | lib/formdata.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/formdata.c b/lib/formdata.c index 2cadb0df8..3f41a4275 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -972,16 +972,14 @@ void curl_formfree(struct curl_httppost *form) if(form->more) curl_formfree(form->more); - if(!(form->flags & HTTPPOST_PTRNAME) && form->name) + if(!(form->flags & HTTPPOST_PTRNAME)) free(form->name); /* free the name */ if(!(form->flags & - (HTTPPOST_PTRCONTENTS|HTTPPOST_BUFFER|HTTPPOST_CALLBACK)) && - form->contents) + (HTTPPOST_PTRCONTENTS|HTTPPOST_BUFFER|HTTPPOST_CALLBACK)) + ) free(form->contents); /* free the contents */ - if(form->contenttype) - free(form->contenttype); /* free the content type */ - if(form->showfilename) - free(form->showfilename); /* free the faked file name */ + free(form->contenttype); /* free the content type */ + free(form->showfilename); /* free the faked file name */ free(form); /* free the struct */ } while((form = next) != NULL); /* continue */ |