Changeset 51a56b3

Timestamp:

May 24, 2010, 8:22:54 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

release-1.6

Children:

935b8d8

Parents:

70087b9

git-author:

David Benjamin <davidben@mit.edu> (05/13/10 14:09:43)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/24/10 20:22:54)

Message:

Free temporary argv in done segment

Otherwise we leak memory when failing out of the getopt loop. We also
can punt the strdups, as getopt doesn't mutate them.

File:

• commands.c (modified) (3 diffs)

commands.c

@@ -1297 +1297 @@
 
   for (i = 0; i < argc; i++)
-    tmp_argv[i] = owl_strdup(argv[i]);
+    tmp_argv[i] = argv[i];
 
   static struct option options[] = {
@@ -1317 +1317 @@
   }
 
-  for (i = 0; i < argc; i++)
-    owl_free(tmp_argv[i]);
-  owl_free(tmp_argv);
-
   filtname = owl_function_smartfilter(instance, related);
 
@@ -1329 +1325 @@
 
 done:
+  owl_free(tmp_argv);
+
   optind = 0; /* reset getopt */
   return NULL;