diff options
author | taca <taca> | 2015-06-28 15:34:16 +0000 |
---|---|---|
committer | taca <taca> | 2015-06-28 15:34:16 +0000 |
commit | c67fedd299e4a48fd86ee764e80cb4c3a54294da (patch) | |
tree | 8e5d655321f38a7c69f4cae23b3b042f42fd0327 /lang/php54 | |
parent | 521fc5d41eaa657248ca241bb59ebd06f9dd419c (diff) | |
download | pkgsrc-c67fedd299e4a48fd86ee764e80cb4c3a54294da.tar.gz |
Add fix to https://bugs.php.net/bug.php?id=69737.
Bump PKGREVISION.
Diffstat (limited to 'lang/php54')
-rw-r--r-- | lang/php54/Makefile | 3 | ||||
-rw-r--r-- | lang/php54/distinfo | 3 | ||||
-rw-r--r-- | lang/php54/patches/patch-ext_spl_spl__heap.c | 18 |
3 files changed, 22 insertions, 2 deletions
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 */ |