Patch bug64544.patch for CGI/CLI related Bug #64544

Patch version 2013-03-29 03:11 UTC

Obsoleted by patches:

• bug64544.patch, revision 2013-03-29 03:52 UTC

Developer: laruence@php.net

Line 1 (now 1), was 64 lines, now 41 lines
 diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
 index 4b8bae7..7290523 100644
 --- a/sapi/cli/php_cli.c
 +++ b/sapi/cli/php_cli.c
 @@ -1402,7 +1402,7 @@ out:
  	 * Do not move this de-initialization. It needs to happen right before
  	 * exiting.
  	 */
 -        cleanup_ps_args(argv);
 +	cleanup_ps_args(argv);
  	exit(exit_status);
  }
  /* }}} */
  diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
 index a2e47f0..2845370 100644
 index a2e47f0..0da1dff 100644
  --- a/sapi/cli/ps_title.c
  +++ b/sapi/cli/ps_title.c
 @@ -124,6 +124,7 @@ static size_t ps_buffer_cur_len; /* actual string length in ps_buffer */
 @@ -123,6 +123,7 @@ static size_t ps_buffer_cur_len; /* actual string length in ps_buffer */
  /* save the original argv[] location here */
   static int save_argc;
   static char** save_argv;
 +static char** new_environ;
   
 +static char **new_environ, **frozen_environ;
   
   /*
   * Call this method early, before any code has used the original argv passed in
  @@ -145,7 +146,6 @@ char** save_ps_args(int argc, char** argv)
       {
           char* end_of_area = NULL;
           int non_contiguous_area = 0;
  -        char** new_environ;
           int i;
   
           /*
 @@ -178,6 +178,7 @@ char** save_ps_args(int argc, char** argv)
           * move the environment out of the way
           */
          new_environ = (char **) malloc((i + 1) * sizeof(char *));
 +        frozen_environ = (char **) malloc((i + 1) * sizeof(char *));
          if (!new_environ)
              goto clobber_error;
          for (i = 0; environ[i] != NULL; i++)
 @@ -188,7 +189,7 @@ char** save_ps_args(int argc, char** argv)
 @@ -188,7 +188,6 @@ char** save_ps_args(int argc, char** argv)
           }
           new_environ[i] = NULL;
           environ = new_environ;
  -
 +        memcpy((char *)frozen_environ, (char *)new_environ, sizeof(char *) * (i + 1));
       }
   #endif /* PS_USE_CLOBBER_ARGV */
   
 @@ -405,9 +406,10 @@ void cleanup_ps_args(char **argv)
 @@ -405,9 +404,9 @@ void cleanup_ps_args(char **argv)
   #ifdef PS_USE_CLOBBER_ARGV
           {
               int i;
  -            for (i = 0; environ[i] != NULL; i++)
  -                free(environ[i]);
  -            free(environ);
 +            for (i = 0; frozen_environ[i] != NULL; i++)
 +                free(frozen_environ[i]);
 +            free(frozen_environ);
 +            for (i = 0; new_environ[i] != NULL; i++)
 +                free(new_environ[i]);
  +            free(new_environ);
           }
   #endif /* PS_USE_CLOBBER_ARGV */