Changeset 88e425f

Timestamp:

May 13, 2010, 2:28:14 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

e54a746

Parents:

0881cdd

git-author:

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

git-committer:

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

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;