]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix deref before null check
authorMichael Jerris <mike@jerris.com>
Mon, 28 Apr 2014 17:01:12 +0000 (13:01 -0400)
committerMichael Jerris <mike@jerris.com>
Mon, 28 Apr 2014 17:01:12 +0000 (13:01 -0400)
src/switch_curl.c

index c0f08bbefa5a82aa0a65d3947659b31aaf1b9e11..5bd2e52db3cf09c6218856884d15664ba216dab7 100644 (file)
@@ -81,21 +81,21 @@ SWITCH_DECLARE(switch_status_t) switch_curl_process_form_post_params(switch_even
 
                if (!strncasecmp(hp->name, "attach_file:", 12)) {
                        char *pname = strdup(hp->name + 12);
-                       char *fname = strchr(pname, ':');
                        
-                       if (fname && pname) {
-                               *fname++ = '\0';
-
-                               curl_formadd(&formpost,
-                                                        &lastptr,
-                                                        CURLFORM_COPYNAME, pname,
-                                                        CURLFORM_FILENAME, fname,
-                                                        CURLFORM_FILE, hp->value,
-                                                        CURLFORM_END);
+                       if (pname) {
+                               char *fname = strchr(pname, ':');
+                               if (fname) {
+                                       *fname++ = '\0';
+
+                                       curl_formadd(&formpost,
+                                                                &lastptr,
+                                                                CURLFORM_COPYNAME, pname,
+                                                                CURLFORM_FILENAME, fname,
+                                                                CURLFORM_FILE, hp->value,
+                                                                CURLFORM_END);
+                               }
+                               free(pname);
                        }
-
-                       free(pname);
-
                } else {
                        curl_formadd(&formpost,
                                                 &lastptr,