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 16:38:31 +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-87804@lists.php.net to get a copy of this message | ||
Commit: 6dedeb40db13971af45276f80b5375030aa7e76f
Author: Stanislav Malyshev <stas@php.net> Sat, 4 Jul 2015 23:47:48 -0700
Parents: bf58162ddf970f63502837f366930e44d6a992cf
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6dedeb40db13971af45276f80b5375030aa7e76f
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 223bfe8..ba73462 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2142,7 +2142,7 @@ char *tsrm_strtok_r(char *s, const char *delim, char **last) /* {{{ */
*/
char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC) /* {{{ */
{
- char newpath[MAXPATHLEN];
+ char *newpath;
int newpath_len;
char *ptr;
char *tok;
@@ -2150,8 +2150,10 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC) /*
{{{
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;
}
@@ -2174,6 +2176,7 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC) /*
{{{
if (*tok == '.') {
efree(path);
*new_len = 1;
+ efree(newpath);
return estrndup("/", 1);
}
break;
@@ -2181,9 +2184,11 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC) /*
{{{
if (tok[0] == '.' && tok[1] == '.') {
efree(path);
*new_len = 1;
+ efree(newpath);
return estrndup("/", 1);
}
}
+ efree(newpath);
return path;
}
@@ -2232,7 +2237,8 @@ last_time:
efree(path);
*new_len = newpath_len;
- return estrndup(newpath, newpath_len);
+ newpath[newpath_len] = '\0';
+ return erealloc(newpath, newpath_len + 1);
}
/* }}} */