com php-src: Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath: ext/phar/phar.c
| From: | Stanislav Malyshev | Date: | Tue, 07 Jul 2015 17:15:41 +0000 |
| Subject: | com php-src: Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath: ext/phar/phar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87822@lists.php.net to get a copy of this message | ||
Commit: 12ff95574bb1303fc03695a1721a8b4529d1ed0a
Author: Stanislav Malyshev <stas@php.net> Sat, 4 Jul 2015 23:47:48 -0700
Parents: 00f177a5edb7f2578f75091fdf6fb1a1c8d994a2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=12ff95574bb1303fc03695a1721a8b4529d1ed0a
Log:
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Bugs:
https://bugs.php.net/69923
Changed paths:
M ext/phar/phar.c
Diff:
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 578b0a3..1ed4c80 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2073,7 +2073,7 @@ static int php_check_dots(const char *element, int n) /* {{{ */
*/
char *phar_fix_filepath(char *path, int *new_len, int use_cwd) /* {{{ */
{
- char newpath[MAXPATHLEN];
+ char *newpath;
int newpath_len;
char *ptr;
char *tok;
@@ -2081,8 +2081,10 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd) /* {{{ */
if (PHAR_G(cwd_len) && use_cwd && path_length > 2 && path[0] ==
'.' && path[1] == '/') {
newpath_len = PHAR_G(cwd_len);
+ newpath = emalloc(strlen(path) + newpath_len + 1);
memcpy(newpath, PHAR_G(cwd), newpath_len);
} else {
+ newpath = emalloc(strlen(path) + 2);
newpath[0] = '/';
newpath_len = 1;
}
@@ -2105,6 +2107,7 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd) /* {{{ */
if (*tok == '.') {
efree(path);
*new_len = 1;
+ efree(newpath);
return estrndup("/", 1);
}
break;
@@ -2112,9 +2115,11 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd) /* {{{ */
if (tok[0] == '.' && tok[1] == '.') {
efree(path);
*new_len = 1;
+ efree(newpath);
return estrndup("/", 1);
}
}
+ efree(newpath);
return path;
}
@@ -2163,7 +2168,8 @@ last_time:
efree(path);
*new_len = newpath_len;
- return estrndup(newpath, newpath_len);
+ newpath[newpath_len] = '\0';
+ return erealloc(newpath, newpath_len + 1);
}
/* }}} */