Browse Source

- Fixed bug #52573 (SplFileObject::fscanf Segmentation fault)

experimental/with_scalar_types
Felipe Pena 16 years ago
parent
commit
c10bb27254
  1. 6
      ext/spl/spl_directory.c
  2. 12
      ext/spl/tests/bug52573.phpt

6
ext/spl/spl_directory.c

@ -1865,7 +1865,11 @@ static int spl_filesystem_file_call(spl_filesystem_object *intern, zend_function
result = zend_call_function(&fci, &fcic TSRMLS_CC);
ZVAL_ZVAL(return_value, retval, 1, 1);
if (result == FAILURE) {
RETVAL_FALSE;
} else {
ZVAL_ZVAL(return_value, retval, 1, 1);
}
efree(params);
return result;

12
ext/spl/tests/bug52573.phpt

@ -0,0 +1,12 @@
--TEST--
Bug #52573 (SplFileObject::fscanf Segmentation fault)
--FILE--
<?php
$result = null;
$f = new SplFileObject(__FILE__, 'r');
$f->fscanf('<?php // %s', $result);
?>
--EXPECTF--
Warning: Parameter 3 to fscanf() expected to be a reference, value given in %s on line 5
Loading…
Cancel
Save