mirror of
https://github.com/php/php-src.git
synced 2024-12-03 23:05:57 +08:00
Merge branch 'PHP-5.5'
* PHP-5.5: - Moved NULL check before dereferencing
This commit is contained in:
commit
048923b3c6
@ -102,14 +102,14 @@ static char * php_zip_make_relative_path(char *path, int path_len) /* {{{ */
|
||||
char *path_begin = path;
|
||||
size_t i;
|
||||
|
||||
if (IS_SLASH(path[0])) {
|
||||
return path + 1;
|
||||
}
|
||||
|
||||
if (path_len < 1 || path == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (IS_SLASH(path[0])) {
|
||||
return path + 1;
|
||||
}
|
||||
|
||||
i = path_len;
|
||||
|
||||
while (1) {
|
||||
|
Loading…
Reference in New Issue
Block a user