Correct a memory leak in NSH

patacongo · patacongo · commit 7f474703fa4d · 2013-02-02T23:56:54.000Z
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5600 42af7a65-404d-4744-a932-0658087f49c3
diff --git a/builtin/exec_builtin.c b/builtin/exec_builtin.c
@@ -140,16 +140,16 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
 
   /* Initialize attributes for task_spawn(). */
 
-  ret = posix_spawn_file_actions_init(&file_actions);
+  ret = posix_spawnattr_init(&attr);
   if (ret != 0)
     {
       goto errout_with_errno;
     }
 
-  ret = posix_spawnattr_init(&attr);
+  ret = posix_spawn_file_actions_init(&file_actions);
   if (ret != 0)
     {
-      goto errout_with_errno;
+      goto errout_with_attrs;
     }
 
   /* Set the correct task size and priority */
@@ -158,13 +158,13 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
   ret = posix_spawnattr_setschedparam(&attr, &param);
   if (ret != 0)
     {
-      goto errout_with_errno;
+      goto errout_with_actions;
     }
 
   ret = task_spawnattr_setstacksize(&attr, builtin->stacksize);
   if (ret != 0)
     {
-      goto errout_with_errno;
+      goto errout_with_actions;
     }
 
    /* If robin robin scheduling is enabled, then set the scheduling policy
@@ -175,21 +175,21 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
   ret = posix_spawnattr_setschedpolicy(&attr, SCHED_RR);
   if (ret != 0)
     {
-      goto errout_with_errno;
+      goto errout_with_actions;
     }
 
   ret = posix_spawnattr_setflags(&attr,
                                  POSIX_SPAWN_SETSCHEDPARAM |
                                  POSIX_SPAWN_SETSCHEDULER);
   if (ret != 0)
     {
-      goto errout_with_errno;
+      goto errout_with_actions;
     }
 #else
   ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDPARAM);
   if (ret != 0)
     {
-      goto errout_with_errno;
+      goto errout_with_actions;
     }
 #endif
 
@@ -204,7 +204,7 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
       if (ret != 0)
         {
           sdbg("ERROR: posix_spawn_file_actions_addopen failed: %d\n", ret);
-          goto errout_with_errno;
+          goto errout_with_actions;
         }
     }
 
@@ -216,16 +216,28 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
   if (ret != 0)
     {
       sdbg("ERROR: task_spawn failed: %d\n", ret);
-      goto errout_with_errno;
+      goto errout_with_actions;
     }
 
+  /* Free attibutes and file actions.  Ignoring return values in the case
+   * of an error.
+   */
+
   /* Return the task ID of the new task if the task was sucessfully
    * started.  Otherwise, ret will be ERROR (and the errno value will
    * be set appropriately).
    */
 
+  (void)posix_spawn_file_actions_destroy(&file_actions);
+  (void)posix_spawnattr_destroy(&attr);
   return pid;
 
+errout_with_actions:
+  (void)posix_spawn_file_actions_destroy(&file_actions);
+
+errout_with_attrs:
+  (void)posix_spawnattr_destroy(&attr);
+
 errout_with_errno:
   set_errno(ret);
   return ERROR;
diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
@@ -1424,6 +1424,13 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
        * successfully).  So certainly it is not an NSH command.
        */
 
+      /* Free the redirected output file path */
+
+      nsh_freefullpath(redirfile);
+      redirfile = NULL;
+
+      /* Save the result:  success if 0; failure if 1 */
+
       return nsh_saveresult(vtbl, ret != OK);
     }
 
@@ -1458,6 +1465,13 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline)
        * successfully).  So certainly it is not an NSH command.
        */
 
+      /* Free the redirected output file path */
+
+      nsh_freefullpath(redirfile);
+      redirfile = NULL;
+
+      /* Save the result:  success if 0; failure if 1 */
+
       return nsh_saveresult(vtbl, ret != OK);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -140,16 +140,16 @@ int exec_builtin(FAR const char appname, FAR char const *argv,`
`140`	`140`
`141`	`141`	`/* Initialize attributes for task_spawn(). */`
`142`	`142`
`143`		`- ret = posix_spawn_file_actions_init(&file_actions);`
	`143`	`+ ret = posix_spawnattr_init(&attr);`
`144`	`144`	`if (ret != 0)`
`145`	`145`	`{`
`146`	`146`	`goto errout_with_errno;`
`147`	`147`	`}`
`148`	`148`
`149`		`- ret = posix_spawnattr_init(&attr);`
	`149`	`+ ret = posix_spawn_file_actions_init(&file_actions);`
`150`	`150`	`if (ret != 0)`
`151`	`151`	`{`
`152`		`- goto errout_with_errno;`
	`152`	`+ goto errout_with_attrs;`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/* Set the correct task size and priority */`
`@@ -158,13 +158,13 @@ int exec_builtin(FAR const char appname, FAR char const *argv,`
`158`	`158`	`ret = posix_spawnattr_setschedparam(&attr, &param);`
`159`	`159`	`if (ret != 0)`
`160`	`160`	`{`
`161`		`- goto errout_with_errno;`
	`161`	`+ goto errout_with_actions;`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`ret = task_spawnattr_setstacksize(&attr, builtin->stacksize);`
`165`	`165`	`if (ret != 0)`
`166`	`166`	`{`
`167`		`- goto errout_with_errno;`
	`167`	`+ goto errout_with_actions;`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/* If robin robin scheduling is enabled, then set the scheduling policy`
`@@ -175,21 +175,21 @@ int exec_builtin(FAR const char appname, FAR char const *argv,`
`175`	`175`	`ret = posix_spawnattr_setschedpolicy(&attr, SCHED_RR);`
`176`	`176`	`if (ret != 0)`
`177`	`177`	`{`
`178`		`- goto errout_with_errno;`
	`178`	`+ goto errout_with_actions;`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`ret = posix_spawnattr_setflags(&attr,`
`182`	`182`	`POSIX_SPAWN_SETSCHEDPARAM \|`
`183`	`183`	`POSIX_SPAWN_SETSCHEDULER);`
`184`	`184`	`if (ret != 0)`
`185`	`185`	`{`
`186`		`- goto errout_with_errno;`
	`186`	`+ goto errout_with_actions;`
`187`	`187`	`}`
`188`	`188`	`#else`
`189`	`189`	`ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDPARAM);`
`190`	`190`	`if (ret != 0)`
`191`	`191`	`{`
`192`		`- goto errout_with_errno;`
	`192`	`+ goto errout_with_actions;`
`193`	`193`	`}`
`194`	`194`	`#endif`
`195`	`195`
`@@ -204,7 +204,7 @@ int exec_builtin(FAR const char appname, FAR char const *argv,`
`204`	`204`	`if (ret != 0)`
`205`	`205`	`{`
`206`	`206`	`sdbg("ERROR: posix_spawn_file_actions_addopen failed: %d\n", ret);`
`207`		`- goto errout_with_errno;`
	`207`	`+ goto errout_with_actions;`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`@@ -216,16 +216,28 @@ int exec_builtin(FAR const char appname, FAR char const *argv,`
`216`	`216`	`if (ret != 0)`
`217`	`217`	`{`
`218`	`218`	`sdbg("ERROR: task_spawn failed: %d\n", ret);`
`219`		`- goto errout_with_errno;`
	`219`	`+ goto errout_with_actions;`
`220`	`220`	`}`
`221`	`221`
	`222`	`+ /* Free attibutes and file actions. Ignoring return values in the case`
	`223`	`+ * of an error.`
	`224`	`+ */`
	`225`	`+`
`222`	`226`	`/* Return the task ID of the new task if the task was sucessfully`
`223`	`227`	`* started. Otherwise, ret will be ERROR (and the errno value will`
`224`	`228`	`* be set appropriately).`
`225`	`229`	`*/`
`226`	`230`
	`231`	`+ (void)posix_spawn_file_actions_destroy(&file_actions);`
	`232`	`+ (void)posix_spawnattr_destroy(&attr);`
`227`	`233`	`return pid;`
`228`	`234`
	`235`	`+errout_with_actions:`
	`236`	`+ (void)posix_spawn_file_actions_destroy(&file_actions);`
	`237`	`+`
	`238`	`+errout_with_attrs:`
	`239`	`+ (void)posix_spawnattr_destroy(&attr);`
	`240`	`+`
`229`	`241`	`errout_with_errno:`
`230`	`242`	`set_errno(ret);`
`231`	`243`	`return ERROR;`