Skip to content

prevent overflow in oapv_decode() #53

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
kpchoi merged 1 commit into from
Mar 5, 2025
Merged

prevent overflow in oapv_decode() #53

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 src/oapv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1959,10 +1959,10 @@ int oapvd_decode(oapvd_t did, oapv_bitb_t *bitb, oapv_frms_t *ofrms, oapvm_t mid
oapv_bsr_init(&ctx->bs, (u8 *)bitb->addr + cur_read_size, remain, NULL);
bs = &ctx->bs;

ret = oapvd_vlc_pbu_size(bs, &pbu_size); // 4byte
ret = oapvd_vlc_pbu_size(bs, &pbu_size); // read pbu_size (4 byte)
oapv_assert_g(OAPV_SUCCEEDED(ret), ERR);
oapv_assert_gv((pbu_size + 4) <= bs->size, ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);

remain -= 4; // size of pbu_size syntax
oapv_assert_gv(pbu_size <= remain, ret, OAPV_ERR_MALFORMED_BITSTREAM, ERR);

ret = oapvd_vlc_pbu_header(bs, &pbuh);
oapv_assert_g(OAPV_SUCCEEDED(ret), ERR);
Expand Down Expand Up @@ -2075,7 +2075,7 @@ int oapvd_info(void *au, int au_size, oapv_au_info_t *aui)

ret = oapvd_vlc_pbu_size(&bs, &pbu_size); // read pbu_size (4 byte)
oapv_assert_rv(OAPV_SUCCEEDED(ret), ret);
remain -= 4; // pbu_size syntax
remain -= 4; // size of pbu_size syntax
oapv_assert_rv(pbu_size <= remain, OAPV_ERR_MALFORMED_BITSTREAM);

/* pbu header */
Expand Down