Skip to content

removed overflow issue of pbu_size #52

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
Feb 26, 2025
Merged

removed overflow issue of pbu_size #52

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
12 changes: 7 additions & 5 deletions src/oapv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,20 +2065,22 @@ int oapvd_info(void *au, int au_size, oapv_au_info_t *aui)

DUMP_SET(0);

/* 'au' address contains series of PBU */
do {
oapv_bs_t bs;
u32 pbu_size = 0;
u32 pbu_size = 0;
u32 remain = au_size - cur_read_size;
oapv_assert_rv((remain >= 8), OAPV_ERR_MALFORMED_BITSTREAM);
oapv_bsr_init(&bs, (u8 *)au + cur_read_size, remain, NULL);

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

/* pbu header */
oapv_pbuh_t pbuh;
ret = oapvd_vlc_pbu_header(&bs, &pbuh); // 4 byte
ret = oapvd_vlc_pbu_header(&bs, &pbuh); // read pbu_header() (4 byte)
oapv_assert_rv(OAPV_SUCCEEDED(ret), OAPV_ERR_MALFORMED_BITSTREAM);
if(pbuh.pbu_type == OAPV_PBU_TYPE_AU_INFO) {
// parse access_unit_info in PBU
Expand Down Expand Up @@ -2109,7 +2111,7 @@ int oapvd_info(void *au, int au_size, oapv_au_info_t *aui)
frm_count++;
}
aui->num_frms = frm_count;
cur_read_size += pbu_size + 4;
cur_read_size += pbu_size + 4; /* 4byte is for pbu_size syntax itself */
} while(cur_read_size < au_size);
DUMP_SET(1);
return OAPV_OK;
Expand Down