Update nxt_process_title.c

CID 200480 (nginx#2 of 2): Resource leak (RESOURCE_LEAK)22. leaked_storage: Variable p going out of scope leaks the storage it points to.
RanierV · Dec 1, 2017 · 9173b78 · 9173b78
1 parent 858cb4d
commit 9173b78
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/nxt_process_title.c b/src/nxt_process_title.c
@@ -116,11 +116,6 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp)
         }
     }
 
-    p = nxt_malloc(strings_size);
-    if (p == NULL) {
-        return;
-    }
-
     if (argv_end == end) {
         /*
          * There is no reason to modify environ if arguments
@@ -130,6 +125,11 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp)
         goto done;
     }
 
+    p = nxt_malloc(strings_size);
+    if (p == NULL) {
+       goto done;
+    }
+
     end = argv[0];
 
     for (i = 0; argv[i] != NULL; i++) {
@@ -149,7 +149,7 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp)
 
     env = nxt_malloc(environ_size);
     if (env == NULL) {
-        return;
+       goto done;
     }
 
     /*
@@ -178,6 +178,12 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp)
     }
 
 done:
+    if (p != NULL) {
+       nxt_free(p);
+    }
+    if (env != NULL) {
+       nxt_free(env);
+    }
 
     /* Preserve space for the trailing zero. */
     end--;