php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-11 18:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

(unserialize) now cleans up better on failure!

Browse Source
This commit is contained in:
Thies C. Arntzen
1999-12-08 14:40:46 +00:00
parent f7089e600f
commit 276c0a378d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/standard/var.c
View File

@@ -428,7 +428,6 @@ int php_var_unserialize(pval **rval, const char **p, const char *max)
(*p)++;
}
if (**p != ':' || *((*p) + 1) != '{') {
pval_destructor(*rval);
return 0;
}
for ((*p) += 2; **p && **p != '}' && i > 0; i--) {
@@ -436,13 +435,11 @@ int php_var_unserialize(pval **rval, const char **p, const char *max)
pval *data = emalloc(sizeof(pval));
if (!php_var_unserialize(&key, p, max)) {
pval_destructor(*rval);
efree(key);
efree(data);
return 0;
}
if (!php_var_unserialize(&data, p, max)) {
pval_destructor(*rval);
pval_destructor(key);
efree(key);
efree(data);
@@ -503,6 +500,7 @@ PHP_FUNCTION(unserialize)
}
if (!php_var_unserialize(&return_value, &p, p + (*buf)->value.str.len)) {
zval_dtor(return_value);
php_error(E_NOTICE, "unserialize() failed at offset %d of %d bytes",p-(*buf)->value.str.val,(*buf)->value.str.len);
RETURN_FALSE;
}