svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_heap.c branches/PHP_5_3/ext/spl/tests/bug53588.phpt trunk/ext/pdo/pdo_dbh.c
trunk/ext/spl/spl_heap.c trunk/ext/spl/tests/bug53588.phpt
| From: | Gustavo André dos Santos Lopes | Date: | Tue, 21 Dec 2010 19:52:17 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_heap.c branches/PHP_5_3/ext/spl/tests/bug53588.phpt trunk/ext/pdo/pdo_dbh.c trunk/ext/spl/spl_heap.c trunk/ext/spl/tests/bug53588.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64194@lists.php.net to get a copy of this message | ||
cataphract Tue, 21 Dec 2010 19:52:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306552
Log:
- Revert of revision 306542, turns out the semantics of compare() are
different in SplMinHeap and SplMaxHeap.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/spl/spl_heap.c
U php/php-src/branches/PHP_5_3/ext/spl/tests/bug53588.phpt
U php/php-src/trunk/ext/pdo/pdo_dbh.c
U php/php-src/trunk/ext/spl/spl_heap.c
U php/php-src/trunk/ext/spl/tests/bug53588.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-21 19:41:49 UTC (rev 306551)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-21 19:52:17 UTC (rev 306552)
@@ -70,8 +70,6 @@
- SPL extension:
. Fixed bug #53515 (property_exists incorrect on ArrayObject null and 0
values). (Felipe)
- . Fixed bug #53588 (SplMinHeap bad sorting with custom compare function).
- (Gustavo)
- SQLite extension:
. Fixed memory leaked introduced by the NULL poisoning patch (Mateusz Kocielski, Pierre)
Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_heap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_heap.c 2010-12-21 19:41:49 UTC (rev 306551)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_heap.c 2010-12-21 19:52:17 UTC (rev 306552)
@@ -176,7 +176,7 @@
spl_heap_object *heap_object = (spl_heap_object*)zend_object_store_get_object((zval *)object
TSRMLS_CC);
if (heap_object->fptr_cmp) {
long lval = 0;
- if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, (zval *)b, (zval *)a, &lval
TSRMLS_CC) == FAILURE) {
+ if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, (zval *)a, (zval *)b, &lval
TSRMLS_CC) == FAILURE) {
/* exception or call failure */
return 0;
}
Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/bug53588.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug53588.phpt 2010-12-21 19:41:49 UTC (rev 306551)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug53588.phpt 2010-12-21 19:52:17 UTC (rev 306552)
@@ -1,23 +0,0 @@
---TEST--
-Bug #53588 (SplMinHeap bad sorting with custom compare function)
---FILE--
-<?php
-class MySimpleHeap extends SplMinHeap{
- public function compare( $value1, $value2 ){
- return ( $value1 - $value2 );
- }
-}
-
-$obj = new MySimpleHeap();
-$obj->insert( 8 );
-$obj->insert( 0 );
-$obj->insert( 4 );
-
-foreach( $obj as $number ) {
- echo $number, "\n";
-}
---EXPECT--
-0
-4
-8
-
Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-12-21 19:41:49 UTC (rev 306551)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-12-21 19:52:17 UTC (rev 306552)
@@ -229,6 +229,7 @@
snprintf(alt_dsn, sizeof(alt_dsn), "pdo.dsn.%s", data_source);
if (FAILURE == cfg_get_string(alt_dsn, &ini_dsn)) {
zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, "invalid data source
name");
+ zval_dtor(object);
ZVAL_NULL(object);
return;
}
Modified: php/php-src/trunk/ext/spl/spl_heap.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_heap.c 2010-12-21 19:41:49 UTC (rev 306551)
+++ php/php-src/trunk/ext/spl/spl_heap.c 2010-12-21 19:52:17 UTC (rev 306552)
@@ -176,7 +176,7 @@
spl_heap_object *heap_object = (spl_heap_object*)zend_object_store_get_object((zval *)object
TSRMLS_CC);
if (heap_object->fptr_cmp) {
long lval = 0;
- if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, (zval *)b, (zval *)a, &lval
TSRMLS_CC) == FAILURE) {
+ if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, (zval *)a, (zval *)b, &lval
TSRMLS_CC) == FAILURE) {
/* exception or call failure */
return 0;
}
Modified: php/php-src/trunk/ext/spl/tests/bug53588.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/bug53588.phpt 2010-12-21 19:41:49 UTC (rev 306551)
+++ php/php-src/trunk/ext/spl/tests/bug53588.phpt 2010-12-21 19:52:17 UTC (rev 306552)
@@ -1,23 +0,0 @@
---TEST--
-Bug #53588 (SplMinHeap bad sorting with custom compare function)
---FILE--
-<?php
-class MySimpleHeap extends SplMinHeap{
- public function compare( $value1, $value2 ){
- return ( $value1 - $value2 );
- }
-}
-
-$obj = new MySimpleHeap();
-$obj->insert( 8 );
-$obj->insert( 0 );
-$obj->insert( 4 );
-
-foreach( $obj as $number ) {
- echo $number, "\n";
-}
---EXPECT--
-0
-4
-8
-