- Fixed possible NULL ptr dereference

felipensp · felipensp · commit 52555a78946c · 2013-10-20T09:04:24.000-02:00
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -1262,8 +1262,10 @@ int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, ch
 					spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, (*fd_ptr)->fname, fname);
 				}
 				if (SUCCESS == phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) {
-					efree(*error);
-					*error = NULL;
+					if (error) {
+						efree(*error);
+						*error = NULL;
+					}
 				}
 				return FAILURE;
 			}

Original file line number	Diff line number	Diff line change
`@@ -1262,8 +1262,10 @@ int phar_get_archive(phar_archive_data *archive, char fname, int fname_len, ch`
`1262`	`1262`	`spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, (*fd_ptr)->fname, fname);`
`1263`	`1263`	`}`
`1264`	`1264`	`if (SUCCESS == phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) {`
`1265`		`- efree(*error);`
`1266`		`- *error = NULL;`
	`1265`	`+ if (error) {`
	`1266`	`+ efree(*error);`
	`1267`	`+ *error = NULL;`
	`1268`	`+ }`
`1267`	`1269`	`}`
`1268`	`1270`	`return FAILURE;`
`1269`	`1271`	`}`