diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:51:45 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:51:45 +0200 |
| commit | bc0161b72063f79bd80af3cfefe28a4f20115610 (patch) | |
| tree | 16abc6bc60533d2e39b4a6d418351191050cabb5 /Zend/zend_API.c | |
| parent | d24c5de1732d44937ee33ba4a198d13af8f69fc9 (diff) | |
| parent | 618de55485965f3ca6e1fecafd9414da3afa6d5c (diff) | |
| download | php-git-bc0161b72063f79bd80af3cfefe28a4f20115610.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (5) and others
# Via Xinchen Hui (3) and Dmitry Stogov (1)
* 'phpng' of git.php.net:php-src:
restore unexpected commit
Convert to unpacked before deleting elements
- Fixed ZTS build
Fix memory error in spl_directory.c
Fix spl_directory cast_object, reenable error
Support for ext/phar (all tests passed)
ext/phar support (incomplete)
Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
Fixed typo
Refactoring ext/xmlrpc (incompleted)
Removed error message that breaks phar
ext/phar support (incomplete)
Refactor ext/gd (all tests passes)
Fixed wrong buffer length (added place for terminating zero)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index f944de9df3..6ef4c0b467 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2883,11 +2883,11 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca /* Skip leading \ */ if (Z_STRVAL_P(callable)[0] == '\\') { - lmname = do_alloca(Z_STRLEN_P(callable) - 1, use_heap); + lmname = do_alloca(Z_STRLEN_P(callable), use_heap); lmname_len = Z_STRLEN_P(callable) - 1; zend_str_tolower_copy(lmname, Z_STRVAL_P(callable) + 1, lmname_len); } else { - lmname = do_alloca(Z_STRLEN_P(callable), use_heap); + lmname = do_alloca(Z_STRLEN_P(callable) + 1, use_heap); lmname_len = Z_STRLEN_P(callable); zend_str_tolower_copy(lmname, Z_STRVAL_P(callable), lmname_len); } |