Update to PHP 5.3.10, rolling in yesterday's security fix and also

fixing a memory leak.  OK robert@
This commit is contained in:
sthen 2012-02-03 08:44:51 +00:00
parent d5be9e9c84
commit 9670a9ddf5
3 changed files with 8 additions and 28 deletions

View File

@ -1,13 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2012/02/02 08:48:27 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2012/02/03 08:44:51 sthen Exp $
PV= 5.3
V= ${PV}.9
SUHOSIN_PHPV= ${V}
V= ${PV}.10
SUHOSIN_PHPV= 5.3.9
SUHOSIN_P_V= 0.9.10
REVISION= 0
REVISION-main= 2
REVISION-fastcgi= 3
REVISION-fpm= 2
INI_TEMPLATES= development production

View File

@ -1,15 +1,15 @@
MD5 (php-5.3.9.tar.gz) = x543TGFCO+tkpp2h61Umtw==
MD5 (php-5.3.10.tar.gz) = Kz0tD/IhdWhZePtqXLzcEw==
MD5 (suhosin-0.9.33.tgz) = DOSYoCqCgeQnTqjjkMK0hw==
MD5 (suhosin-patch-5.3.9-0.9.10.patch.gz) = wJmz1+rJUBirq9Qd7X8wZg==
RMD160 (php-5.3.9.tar.gz) = Sx/y86oFPWnwiLt/CK3qKmr7s6I=
RMD160 (php-5.3.10.tar.gz) = nYUJxgG/yzGwcSsIqajijfCYeDI=
RMD160 (suhosin-0.9.33.tgz) = nGC2lbIm3cvlVisVdiKHgBI+s3I=
RMD160 (suhosin-patch-5.3.9-0.9.10.patch.gz) = zkOSH9mxg7FUcT7NqYKU9saNXyI=
SHA1 (php-5.3.9.tar.gz) = vGf2c+/9nli/Mo8TiYKXNGrNT+M=
SHA1 (php-5.3.10.tar.gz) = 42t1thk61ZM3ep/1utiUUTak1Xs=
SHA1 (suhosin-0.9.33.tgz) = q7MMIuf+NBlVtC7HHtWXxDQ54rg=
SHA1 (suhosin-patch-5.3.9-0.9.10.patch.gz) = e571w+CDEVTfDWKQq6CYnKkBOO0=
SHA256 (php-5.3.9.tar.gz) = QkxjEqsj0fiwE1zVLCwIBU0e6bIWkeXKPrsHdWcLeu4=
SHA256 (php-5.3.10.tar.gz) = 7ib/AD6urvtklzWYDZ7x/60+qMKDbmrVIN5ZjaIl6qs=
SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
SHA256 (suhosin-patch-5.3.9-0.9.10.patch.gz) = RDjK6rChDGyUrun36qcD9Xmfl9TgV59DqUe7cxTjgxc=
SIZE (php-5.3.9.tar.gz) = 15390277
SIZE (php-5.3.10.tar.gz) = 15390163
SIZE (suhosin-0.9.33.tgz) = 104488
SIZE (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-main_php_variables_c,v 1.1 2012/02/02 08:48:27 sthen Exp $
http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/main/php_variables.c?r1=321634&r2=323007&pathrev=323007&view=patch
--- main/php_variables.c.orig.port Sun Jan 1 13:15:04 2012
+++ main/php_variables.c Thu Feb 2 08:08:50 2012
@@ -198,6 +198,9 @@ PHPAPI void php_register_variable_ex(char *var_name, z
MAKE_STD_ZVAL(gpc_element);
array_init(gpc_element);
zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
+ } else {
+ efree(var_orig);
+ return;
}
}
if (index != escaped_index) {