com php-src: Fixed #68915 (wrong assertion here): ext/spl/spl _directory.c
| From: | Xinchen Hui | Date: | Tue, 27 Jan 2015 07:58:32 +0000 |
| Subject: | com php-src: Fixed #68915 (wrong assertion here): ext/spl/spl _directory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84385@lists.php.net to get a copy of this message | ||
Commit: 59593ba66c00220f0161a721c80550b2a0305c31
Author: Xinchen Hui <laruence@php.net> Tue, 27 Jan 2015 15:58:05 +0800
Parents: dfe6aea9cab6df556049ec2c9867d97a97e0fe09
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59593ba66c00220f0161a721c80550b2a0305c31
Log:
Fixed #68915 (wrong assertion here)
Bugs:
https://bugs.php.net/68915
Changed paths:
M ext/spl/spl_directory.c
Diff:
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index faebd7a..e2a836b 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -963,7 +963,6 @@ SPL_METHOD(DirectoryIterator, getExtension)
p = zend_memrchr(fname->val, '.', fname->len);
if (p) {
- assert(p > fname->val);
idx = (int)(p - fname->val);
RETVAL_STRINGL(fname->val + idx + 1, fname->len - idx - 1);
zend_string_release(fname);