From 4f02ddf0f14199480486346b303e90376f46afbf Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@pkgsrc.org>
Date: Tue, 13 Jul 2004 12:22:29 +0000
Subject: fix a memory-use-after-free bug in the Zend engine constant code bump
 php4 PKGREVISION

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

(limited to 'www')

diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index b8257d2ab4e..a1ddec36a40 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -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 @@ HOMEPAGE?=		http://www.php.net/
 #
 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 --git a/www/php4/distinfo b/www/php4/distinfo
index d6a3f1b087b..006f2aee791 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -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 --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai
new file mode 100644
index 00000000000..482383b7b88
--- /dev/null
+++ b/www/php4/patches/patch-ai
@@ -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) {
-- 
cgit v1.2.3