pajoye Sun, 30 Aug 2009 17:13:45 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287900
Log:
- Fixed leak on error in popen/exec (and related functions)
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-08-30 16:29:41 UTC (rev 287899)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-08-30 17:13:45 UTC (rev 287900)
@@ -3,6 +3,8 @@
?? ??? 2009, PHP 5.2.11
- Added missing sanity checks around exif processing (Ilia)
+- Fixed leak on error in popen/exec (and related functions on Windows. (Pierre)
+
- Fixed bug #49289 (bcmath module doesn't compile with phpize configure).
(Jani)
- Fixed bug #49286 (php://input (php_stream_input_read) is broken). (Jani)
Modified: php/php-src/branches/PHP_5_2/TSRM/tsrm_win32.c
===================================================================
--- php/php-src/branches/PHP_5_2/TSRM/tsrm_win32.c 2009-08-30 16:29:41 UTC
(rev 287899)
+++ php/php-src/branches/PHP_5_2/TSRM/tsrm_win32.c 2009-08-30 17:13:45 UTC
(rev 287900)
@@ -239,6 +239,7 @@
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c
"));
sprintf(cmd, "%s /c %s", TWG(comspec), command);
if (!CreateProcess(NULL, cmd, &security, &security,
security.bInheritHandle, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env, cwd,
&startup, &process)) {
+ free(cmd);
return NULL;
}
free(cmd);
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-30 16:29:41 UTC (rev 287899)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-30 17:13:45 UTC (rev 287900)
@@ -16,6 +16,8 @@
- Improved shared extension loading on OSX to use the standard Unix dlopen()
API. (Scott)
+- Fixed leak on error in popen/exec (and related functions) on Windows.
+ (Pierre)
- Fixed possible bad caching of symlinked directories in the realpath cache
on Windows. (Pierre)
- Fixed atime and mtime in stat related functions on Windows. (Pierre)
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===================================================================
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-08-30 16:29:41 UTC
(rev 287899)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-08-30 17:13:45 UTC
(rev 287900)
@@ -371,6 +371,7 @@
sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
if (!CreateProcess(NULL, cmd, &security, &security,
security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) {
+ free(cmd);
return NULL;
}
free(cmd);
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_win32.c 2009-08-30 16:29:41 UTC (rev 287899)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2009-08-30 17:13:45 UTC (rev 287900)
@@ -373,6 +373,7 @@
sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
if (!CreateProcess(NULL, cmd, &security, &security,
security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) {
+ free(cmd);
return NULL;
}
free(cmd);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
