sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

activesock: check remaining buffer size to avoid buffer overflow (#3560)

This commit is contained in:
jimying 2023-05-16 13:04:50 +08:00 committed by GitHub
parent 64eefdfd7b
commit 537958d0a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pjlib/src/pj/activesock.c
View File

@ -507,6 +507,13 @@ static void ioqueue_on_read_complete(pj_ioqueue_key_t *key,
if (asock->read_type == TYPE_RECV && asock->cb.on_data_read) {
ret = (*asock->cb.on_data_read)(asock, r->pkt, r->size,
PJ_SUCCESS, &remainder);
PJ_ASSERT_ON_FAIL(
!asock->stream_oriented || remainder <= r->size, {
PJ_LOG(2, ("",
"App bug! Invalid remainder length from "
"activesock on_data_read()."));
remainder = 0;
});
} else if (asock->read_type == TYPE_RECV_FROM &&
asock->cb.on_data_recvfrom)
{
@ -576,6 +583,13 @@ static void ioqueue_on_read_complete(pj_ioqueue_key_t *key,
// r->size, status, &remainder);
ret = (*asock->cb.on_data_read)(asock, r->pkt, r->size,
status, &remainder);
PJ_ASSERT_ON_FAIL(
!asock->stream_oriented || remainder <= r->size, {
PJ_LOG(2, ("",
"App bug! Invalid remainder length from "
"activesock on_data_read()."));
remainder = 0;
});
} else if (asock->read_type == TYPE_RECV_FROM &&
asock->cb.on_data_recvfrom)