Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Moved NULL check before dereferencing
This commit is contained in:
Felipe Pena 2013-10-20 09:50:13 -02:00
commit 8aa19c9fd8

View File

@ -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) {