Apply patches submitte by doughera++ in TT #1950 and TT #1953.

parrot · Jan 12, 2011 · b51c019 · b51c019
1 parent be8f1a6
commit b51c019
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/config/gen/platform/generic/env.c b/config/gen/platform/generic/env.c
@@ -49,7 +49,9 @@ Parrot_setenv(PARROT_INTERP, STRING *str_name, STRING *str_value)
                             str_value);
     char *envs = Parrot_str_to_platform_cstring(interp, str_envs);
     putenv(envs);
-    Parrot_str_free_cstring(envs);
+    /* Can't free envs because the environment may still be
+       using it.
+    */
 #endif
 }
 

diff --git a/src/pbc_disassemble.c b/src/pbc_disassemble.c
@@ -75,7 +75,8 @@ static struct longopt_opt_decl options[] = {
 #if TRACE_PACKFILE
     { 'D', 'D', OPTION_required_FLAG, { "--debug" } },
 #endif
-    { 'o', 'o', OPTION_required_FLAG, { "--output" } }
+    { 'o', 'o', OPTION_required_FLAG, { "--output" } },
+    {  0 ,  0,  0,                    { NULL } }
 };
 
 /*