Browse Source
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73949 leak in mysqli_fetch_object
pull/2320/head
Joe Watkins
10 years ago
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
3 changed files with
28 additions and
3 deletions
-
NEWS
-
ext/mysqli/mysqli.c
-
ext/mysqli/tests/bug73949.phpt
|
|
|
@ -26,6 +26,9 @@ PHP NEWS |
|
|
|
. Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache). |
|
|
|
(Laruence) |
|
|
|
|
|
|
|
- MySQLi: |
|
|
|
. Fixed bug #73949 (leak in mysqli_fetch_object). (krakjoe) |
|
|
|
|
|
|
|
- Mysqlnd: |
|
|
|
. Fixed bug #69899 (segfault on close() after free_result() with mysqlnd). |
|
|
|
(Richard Fussenegger) |
|
|
|
|
|
|
|
@ -1315,9 +1315,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags |
|
|
|
} else { |
|
|
|
zval_ptr_dtor(&retval); |
|
|
|
} |
|
|
|
if (fci.params) { |
|
|
|
efree(fci.params); |
|
|
|
} |
|
|
|
zend_fcall_info_args_clear(&fci, 1); |
|
|
|
} else if (ctor_params) { |
|
|
|
zend_throw_exception_ex(zend_ce_exception, 0, "Class %s does not have a constructor hence you cannot use ctor_params", ZSTR_VAL(ce->name)); |
|
|
|
} |
|
|
|
|
|
|
|
@ -0,0 +1,24 @@ |
|
|
|
--TEST-- |
|
|
|
Bug #73949 (leak in mysqli_fetch_object) |
|
|
|
--SKIPIF-- |
|
|
|
<?php |
|
|
|
require_once('skipif.inc'); |
|
|
|
require_once('skipifemb.inc'); |
|
|
|
require_once('skipifconnectfailure.inc'); |
|
|
|
?> |
|
|
|
--FILE-- |
|
|
|
<?php |
|
|
|
require_once("connect.inc"); |
|
|
|
|
|
|
|
class cc{ |
|
|
|
function __construct($c=null){ |
|
|
|
} |
|
|
|
}; |
|
|
|
$i=mysqli_connect('p:'.$host, $user, $passwd, $db); |
|
|
|
$res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'"); |
|
|
|
$t=array(new stdClass); |
|
|
|
while($db= mysqli_fetch_object($res,'cc',$t)){} |
|
|
|
print "done!"; |
|
|
|
?> |
|
|
|
--EXPECTF-- |
|
|
|
done! |
