diff options
Diffstat (limited to 'lang/php56')
| -rw-r--r-- | lang/php56/Makefile | 3 | ||||
| -rw-r--r-- | lang/php56/distinfo | 3 | ||||
| -rw-r--r-- | lang/php56/patches/patch-ext_spl_spl__heap.c | 18 |
3 files changed, 22 insertions, 2 deletions
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 */ |