Browse Source

Fix #45216 (Add a default size for fgetss)

experimental/first_unicode_implementation
Etienne Kneuss 18 years ago
parent
commit
6444ec388c
  1. 7
      ext/spl/spl_directory.c
  2. 22
      ext/spl/tests/bug45216.phpt

7
ext/spl/spl_directory.c

@ -2427,7 +2427,12 @@ SPL_METHOD(SplFileObject, fgetss)
spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zval *arg2 = NULL;
MAKE_STD_ZVAL(arg2);
ZVAL_LONG(arg2, intern->u.file.max_line_len);
if (intern->u.file.max_line_len > 0) {
ZVAL_LONG(arg2, intern->u.file.max_line_len);
} else {
ZVAL_LONG(arg2, 1024);
}
spl_filesystem_file_free_line(intern TSRMLS_CC);
intern->u.file.current_line_num++;

22
ext/spl/tests/bug45216.phpt

@ -0,0 +1,22 @@
--TEST--
SPL: SplFileObject::fgetss (bug 45216)
--CREDITS--
Perrick Penet <perrick@noparking.net>
#testfest phpcampparis 2008-06-07
--FILE--
<?php
$file = dirname(__FILE__) . '/foo.html';
file_put_contents($file, 'text 0<div class="tested">text 1</div>');
$handle = fopen($file, 'r');
$object = new SplFileObject($file);
var_dump($object->fgetss());
var_dump(fgetss($handle));
?>
--CLEAN--
<?php
unlink(dirname(__FILE__) . '/foo.html');
?>
--EXPECTF--
string(12) "text 0text 1"
string(12) "text 0text 1"
Loading…
Cancel
Save