com php-src: Fixed bug #68814 (Unchecked return value): ext/phar/phar_object.c
| From: | Xinchen Hui | Date: | Sun, 18 Jan 2015 03:58:16 +0000 |
| Subject: | com php-src: Fixed bug #68814 (Unchecked return value): ext/phar/phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84155@lists.php.net to get a copy of this message | ||
Commit: ad32e033274ea49d05164418241946d2f1798894
Author: Xinchen Hui <laruence@php.net> Sat, 17 Jan 2015 22:58:16 -0500
Parents: b21d9123a50bfeec1a5b4e0bbd50eb277c24b02f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ad32e033274ea49d05164418241946d2f1798894
Log:
Fixed bug #68814 (Unchecked return value)
Bugs:
https://bugs.php.net/68814
Changed paths:
M ext/phar/phar_object.c
Diff:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 2a35a64..f58d125 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -2066,8 +2066,11 @@ static zend_object *phar_rename_archive(phar_archive_data *phar, char *ext,
zend
}
oldpath = estrndup(phar->fname, phar->fname_len);
- oldname = zend_memrchr(phar->fname, '/', phar->fname_len);
- ++oldname;
+ if ((oldname = zend_memrchr(phar->fname, '/', phar->fname_len))) {
+ ++oldname;
+ } else {
+ oldname = phar->fname;
+ }
oldname_len = strlen(oldname);
basename = estrndup(oldname, oldname_len);