com php-src: Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error: NEWS ext/spl/spl_heap.c ext/spl/tests/bug6 9737.phpt
| From: | Stanislav Malyshev | Date: | Tue, 02 Jun 2015 05:07:16 +0000 |
| Subject: | com php-src: Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error: NEWS ext/spl/spl_heap.c ext/spl/tests/bug6 9737.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87041@lists.php.net to get a copy of this message | ||
Commit: 1cbd25ca15383394ffa9ee8601c5de4c0f2f90e1
Author: Stanislav Malyshev <stas@php.net> Mon, 1 Jun 2015 22:06:16 -0700
Parents: 9031a902e3393ff7dc8a02615430a7d894c740fa
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1cbd25ca15383394ffa9ee8601c5de4c0f2f90e1
Log:
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Bugs:
https://bugs..php.net/69737
Changed paths:
M NEWS
M ext/spl/spl_heap.c
A ext/spl/tests/bug69737.phpt
Diff:
diff --git a/NEWS b/NEWS
index 0463d11..e83f8c7 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,10 @@
. Refactored the fix for bug #66084 (simplexml_load_string() mangles empty
node name). (Christoph Michael Becker)
+- SPL:
+ .. Fixed bug #69737 (Segfault when SplMinHeap::compare produces fatal error)..
+ (Stas)
+
14 May 2015, PHP 5.5.25
- Core:
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index 0283307..fad2379 100644
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_heap *heap, spl_ptr_heap_element elem,
v
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/ext/spl/tests/bug69737.phpt b/ext/spl/tests/bug69737.phpt
new file mode 100644
index 0000000..d39ce3d
--- /dev/null
+++ b/ext/spl/tests/bug69737.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #69737 (Segfault when SplMinHeap::compare produces fatal error)
+--FILE--
+<?php
+class SplMinHeap1 extends SplMinHeap {
+ public function compare($a, $b) {
+ return -parent::notexist($a, $b);
+ }
+}
+$h = new SplMinHeap1();
+$h->insert(1);
+$h->insert(6);
+?>
+===DONE===
+--EXPECTF--
+Fatal error: Call to undefined method SplMinHeap::notexist() in %s/bug69737.php on line %d