svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
| From: | Rasmus Lerdorf | Date: | Sat, 06 Aug 2011 23:42:52 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65722@lists.php.net to get a copy of this message | ||
rasmus Sat, 06 Aug 2011 23:42:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314386
Log:
Avoid a potential double-free here
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U php/php-src/trunk/sapi/cli/php_cli_server.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-08-06 23:34:13 UTC (rev 314385)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-08-06 23:42:52 UTC (rev 314386)
@@ -910,6 +910,7 @@
for (p = sal; *p; p++) {
if (sa) {
pefree(sa, 1);
+ sa = NULL;
}
retval = socket((*p)->sa_family, socktype, 0);
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-08-06 23:34:13 UTC (rev 314385)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-08-06 23:42:52 UTC (rev 314386)
@@ -910,6 +910,7 @@
for (p = sal; *p; p++) {
if (sa) {
pefree(sa, 1);
+ sa = NULL;
}
retval = socket((*p)->sa_family, socktype, 0);