Skip to content

Fix GH-16592 msg_send() crashes when the type does not serialize as e… #16599

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

Closed
wants to merge 1 commit into from
Closed

Fix GH-16592 msg_send() crashes when the type does not serialize as e… #16599

Show file tree
Hide file tree
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
14 changes: 11 additions & 3 deletions ext/sysvmsg/sysvmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,19 @@ PHP_FUNCTION(msg_send)
php_var_serialize(&msg_var, message, &var_hash);
PHP_VAR_SERIALIZE_DESTROY(var_hash);

if (UNEXPECTED(EG(exception))) {
smart_str_free(&msg_var);
RETURN_THROWS();
}


zend_string *str = smart_str_extract(&msg_var);
message_len = ZSTR_LEN(str);
/* NB: php_msgbuf is 1 char bigger than a long, so there is no need to
* allocate the extra byte. */
messagebuffer = safe_emalloc(ZSTR_LEN(msg_var.s), 1, sizeof(struct php_msgbuf));
memcpy(messagebuffer->mtext, ZSTR_VAL(msg_var.s), ZSTR_LEN(msg_var.s) + 1);
message_len = ZSTR_LEN(msg_var.s);
messagebuffer = safe_emalloc(message_len, 1, sizeof(struct php_msgbuf));
memcpy(messagebuffer->mtext, ZSTR_VAL(str), message_len + 1);
zend_string_release_ex(str, false);
smart_str_free(&msg_var);
} else {
char *p;
Expand Down
19 changes: 19 additions & 0 deletions ext/sysvmsg/tests/gh16592.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
msg_send() segfault when the type does not serialize as expected
--EXTENSIONS--
sysvmsg
--FILE--
<?php
class Test {
function __serialize() {}
}

$q = msg_get_queue(1);
try {
msg_send($q, 1, new Test, true);
} catch (\TypeError $e) {
echo $e->getMessage();
}
?>
--EXPECT--
Test::__serialize() must return an array
Loading