[pkgsrc/trunk]: pkgsrc/www/php4 fix a memory-use-after-free bug in the Zend e...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a32726775e2
branches:  trunk
changeset: 477957:8a32726775e2
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Tue Jul 13 12:22:29 2004 +0000

description:
fix a memory-use-after-free bug in the Zend engine constant code
bump php4 PKGREVISION

diffstat:

 www/php4/Makefile.common  |   4 ++--
 www/php4/distinfo         |   4 ++--
 www/php4/patches/patch-ai |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 4f1ae44e998c -r 8a32726775e2 www/php4/Makefile.common
--- a/www/php4/Makefile.common  Tue Jul 13 11:35:39 2004 +0000
+++ b/www/php4/Makefile.common  Tue Jul 13 12:22:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2004/07/06 19:52:01 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.41 2004/07/13 12:22:29 jdolecek Exp $
 
 DISTNAME?=             php-${PHP_DIST_VERS}
 CATEGORIES+=           www php4
@@ -17,7 +17,7 @@
 #
 PHP_DIST_VERS=         4.3.7
 PHP_BASE_VERS=         ${PHP_DIST_VERS}
-PKGREVISION=           # empty
+PKGREVISION=           1
 
 DISTFILES?=            ${PHP_DISTFILE}
 PHP_DISTFILE=          ${DISTNAME}${EXTRACT_SUFX}
diff -r 4f1ae44e998c -r 8a32726775e2 www/php4/distinfo
--- a/www/php4/distinfo Tue Jul 13 11:35:39 2004 +0000
+++ b/www/php4/distinfo Tue Jul 13 12:22:29 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2004/07/06 19:52:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.30 2004/07/13 12:22:29 jdolecek Exp $
 
 SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
 Size (php-4.3.7.tar.bz2) = 3963734 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
 SHA1 (patch-ab) = cc7785755774377d4eb2d3d4816cea61234da167
-SHA1 (patch-ac) = 870b04c7021dad21e0a927441c0d9a204cd60f7c
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
+SHA1 (patch-ai) = 91938849757745b13c7738c3aff662b86c41320f
diff -r 4f1ae44e998c -r 8a32726775e2 www/php4/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/php4/patches/patch-ai Tue Jul 13 12:22:29 2004 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.7 2004/07/13 12:22:29 jdolecek Exp $
+
+--- Zend/zend_constants.c.orig 2004-07-13 14:01:27.000000000 +0200
++++ Zend/zend_constants.c      2004-07-13 14:01:54.000000000 +0200
+@@ -265,11 +265,11 @@
+       }
+ 
+       if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
++              zend_error(E_NOTICE,"Constant %s already defined", name);
+               free(c->name);
+               if (!(c->flags & CONST_PERSISTENT)) {
+                       zval_dtor(&c->value);
+               }
+-              zend_error(E_NOTICE,"Constant %s already defined", name);
+               ret = FAILURE;
+       }
+       if (lowercase_name) {