Skip to content

fix(util): reject oversize length in binary message decoders #35388

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

Open
dxbjavid wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

fix(util): reject oversize length in binary message decoders #35388

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
8 changes: 4 additions & 4 deletions include/util/tencode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ static int32_t tDecodeBool(SDecoder* pCoder, bool* val) {
}

static FORCE_INLINE int32_t tDecodeBinaryWithSize(SDecoder* pCoder, uint32_t size, uint8_t** val) {
if (pCoder->pos + size > pCoder->size) {
if (size > pCoder->size - pCoder->pos) {
TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
}

Expand Down Expand Up @@ -444,7 +444,7 @@ static FORCE_INLINE int32_t tDecodeBinaryTo(SDecoder* pCoder, uint8_t* val, uint
TAOS_RETURN(TSDB_CODE_INVALID_MSG);
}

if (pCoder->pos + len > pCoder->size) {
if (len > pCoder->size - pCoder->pos) {
TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
}

Expand Down Expand Up @@ -484,7 +484,7 @@ static FORCE_INLINE int32_t tDecodeBinaryAlloc(SDecoder* pCoder, void** val, uin
if (length) {
if (len) *len = length;

if (pCoder->pos + length > pCoder->size) {
if (length > pCoder->size - pCoder->pos) {
TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
}

Expand All @@ -508,7 +508,7 @@ static FORCE_INLINE int32_t tDecodeBinaryAlloc32(SDecoder* pCoder, void** val, u
if (length) {
if (len) *len = length;

if (pCoder->pos + length > pCoder->size) {
if (length > pCoder->size - pCoder->pos) {
TAOS_RETURN(TSDB_CODE_OUT_OF_RANGE);
}
*val = taosMemoryMalloc(length);
Expand Down
Loading