From 00442fae0b718b86a813122408d281ed4e255dc1 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Sun, 28 Jun 2015 15:34:16 +0000
Subject: Add fix to https://bugs.php.net/bug.php?id=69737.

Bump PKGREVISION.
---
 lang/php54/Makefile                          |  3 ++-
 lang/php54/distinfo                          |  3 ++-
 lang/php54/patches/patch-ext_spl_spl__heap.c | 18 ++++++++++++++++++
 lang/php55/Makefile                          |  3 ++-
 lang/php55/distinfo                          |  3 ++-
 lang/php55/patches/patch-ext_spl_spl__heap.c | 18 ++++++++++++++++++
 lang/php56/Makefile                          |  3 ++-
 lang/php56/distinfo                          |  3 ++-
 lang/php56/patches/patch-ext_spl_spl__heap.c | 18 ++++++++++++++++++
 9 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 lang/php54/patches/patch-ext_spl_spl__heap.c
 create mode 100644 lang/php55/patches/patch-ext_spl_spl__heap.c
 create mode 100644 lang/php56/patches/patch-ext_spl_spl__heap.c

diff --git a/lang/php54/Makefile b/lang/php54/Makefile
index 6c5eef7c7eb..c107a7f982c 100644
--- a/lang/php54/Makefile
+++ b/lang/php54/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2015/03/16 00:26:31 taca Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/28 15:34:16 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index 2cf41f43217..9ab85a571fe 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2015/06/17 12:26:14 fhajny Exp $
+$NetBSD: distinfo,v 1.60 2015/06/28 15:34:16 taca Exp $
 
 SHA1 (php-5.4.42.tar.bz2) = fa7d35d9766ebd055ac7ccdda1d86c53425ea0bc
 RMD160 (php-5.4.42.tar.bz2) = 5b91d856f8637abe1cdbb37adc2f43e3ceef8317
@@ -14,6 +14,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
+SHA1 (patch-ext_spl_spl__heap.c) = 99ad59876bfdee33271bf331090592efcff100a6
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = a95941231097914b884986bb5dc1e7247dbfefe2
 SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
 SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc
diff --git a/lang/php54/patches/patch-ext_spl_spl__heap.c b/lang/php54/patches/patch-ext_spl_spl__heap.c
new file mode 100644
index 00000000000..c3e594ff4dd
--- /dev/null
+++ b/lang/php54/patches/patch-ext_spl_spl__heap.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_spl_spl__heap.c,v 1.1 2015/06/28 15:34:16 taca Exp $
+
+Fix Bug #69737 	Segfault when SplMinHeap::compare produces fatal error.
+
+--- ext/spl/spl_heap.c.orig	2015-06-10 05:11:55.000000000 +0000
++++ ext/spl/spl_heap.c
+@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_
+ 	heap->ctor(elem TSRMLS_CC);
+ 
+ 	/* sifting up */
+-	for(i = heap->count++; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
++	for(i = heap->count; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
+ 		heap->elements[i] = heap->elements[(i-1)/2];
+ 	}
++	heap->count++;
+ 
+ 	if (EG(exception)) {
+ 		/* exception thrown during comparison */
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index bc96bb71622..07a5bd99306 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2015/03/16 00:26:31 taca Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/28 15:34:50 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index b4f80f5468a..2cafd629194 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2015/06/12 00:44:32 taca Exp $
+$NetBSD: distinfo,v 1.42 2015/06/28 15:34:50 taca Exp $
 
 SHA1 (php-5.5.26.tar.bz2) = f2f80ef51d38b39c4ef060942e2ddcfffec9927a
 RMD160 (php-5.5.26.tar.bz2) = abfc8d5fa0615e22d4510bd025195cb9e88c2e77
@@ -15,6 +15,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
 SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30
 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
+SHA1 (patch-ext_spl_spl__heap.c) = cc30baddf4c935b9d9bdfe304409690a24169db0
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
diff --git a/lang/php55/patches/patch-ext_spl_spl__heap.c b/lang/php55/patches/patch-ext_spl_spl__heap.c
new file mode 100644
index 00000000000..56a34f76bde
--- /dev/null
+++ b/lang/php55/patches/patch-ext_spl_spl__heap.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_spl_spl__heap.c,v 1.1 2015/06/28 15:34:50 taca Exp $
+
+Fix Bug #69737 	Segfault when SplMinHeap::compare produces fatal error.
+
+--- ext/spl/spl_heap.c.orig	2015-06-10 12:26:49.000000000 +0000
++++ ext/spl/spl_heap.c
+@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_
+ 	heap->ctor(elem TSRMLS_CC);
+ 
+ 	/* sifting up */
+-	for(i = heap->count++; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
++	for(i = heap->count; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
+ 		heap->elements[i] = heap->elements[(i-1)/2];
+ 	}
++	heap->count++;
+ 
+ 	if (EG(exception)) {
+ 		/* exception thrown during comparison */
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index 1d49728186b..5536179af95 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2015/03/16 00:26:31 taca Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/28 15:35:33 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index 2419d21205c..82f8c702a66 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/06/12 00:47:03 taca Exp $
+$NetBSD: distinfo,v 1.12 2015/06/28 15:35:33 taca Exp $
 
 SHA1 (php-5.6.10.tar.bz2) = 309255ff5ac3d789f0277354f0686404af646e09
 RMD160 (php-5.6.10.tar.bz2) = c5cad85f011889997b0ba9dd5e5b6f013be0fd65
@@ -15,6 +15,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
 SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
 SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
+SHA1 (patch-ext_spl_spl__heap.c) = 0380d44f56efc2992eb64bd9446a75ec46a61a42
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
 SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
diff --git a/lang/php56/patches/patch-ext_spl_spl__heap.c b/lang/php56/patches/patch-ext_spl_spl__heap.c
new file mode 100644
index 00000000000..e81eaea870f
--- /dev/null
+++ b/lang/php56/patches/patch-ext_spl_spl__heap.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_spl_spl__heap.c,v 1.1 2015/06/28 15:35:33 taca Exp $
+
+Fix Bug #69737 	Segfault when SplMinHeap::compare produces fatal error.
+
+--- ext/spl/spl_heap.c.orig	2015-06-10 07:42:27.000000000 +0000
++++ ext/spl/spl_heap.c
+@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_
+ 	heap->ctor(elem TSRMLS_CC);
+ 
+ 	/* sifting up */
+-	for(i = heap->count++; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
++	for(i = heap->count; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) {
+ 		heap->elements[i] = heap->elements[(i-1)/2];
+ 	}
++	heap->count++;
+ 
+ 	if (EG(exception)) {
+ 		/* exception thrown during comparison */
-- 
cgit v1.2.3