Skip to content

Fixed buffer outflow during deserialization of map objects #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2019
Merged

Fixed buffer outflow during deserialization of map objects #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/ds/ds_htable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ int ds_htable_unserialize(ds_htable_t *table, const unsigned char *buffer, size_

PHP_VAR_UNSERIALIZE_INIT(unserialize_data);

while (*pos != '}') {
while (pos != end) {

zval *key = var_tmp_var(&unserialize_data);
zval *value = var_tmp_var(&unserialize_data);
Expand All @@ -1230,10 +1230,6 @@ int ds_htable_unserialize(ds_htable_t *table, const unsigned char *buffer, size_
ds_htable_put(table, key, value);
}

if (pos != end) {
goto error;
}

PHP_VAR_UNSERIALIZE_DESTROY(unserialize_data);
return SUCCESS;

Expand Down