Skip to content

Commit 449f061

Browse files
committed
add size check in m2tsdmx_declare_pid() + null guard in naludmx_hevc_set_parall_type()
ossfuzz issues 414916080 + 414916079
1 parent db03ea4 commit 449f061

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/filters/dmx_m2ts.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,10 @@ static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD
558558
u32 dsi_len = gf_bs_read_u32(bs);
559559
if (dsi_len) {
560560
u32 pos = (u32) gf_bs_get_position(bs);
561-
gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(stream->gpac_meta_dsi+pos, dsi_len) );
562-
gf_bs_skip_bytes(bs, dsi_len);
561+
if (pos < stream->gpac_meta_dsi_size && dsi_len < stream->gpac_meta_dsi_size-pos) {
562+
gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(stream->gpac_meta_dsi+pos, dsi_len) );
563+
gf_bs_skip_bytes(bs, dsi_len);
564+
}
563565
} else {
564566
gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, NULL);
565567
}

src/filters/reframe_nalu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ static void naludmx_hevc_set_parall_type(GF_NALUDmxCtx *ctx, GF_HEVCConfig *hevc
882882

883883
GF_SAFEALLOC(hvc_state, HEVCState);
884884
if (!hvc_state) return;
885-
885+
886886
hvc_state->sps_active_idx = -1;
887887

888888
use_tiles = 0;
@@ -2562,7 +2562,7 @@ static s32 naludmx_parse_nal_hevc(GF_NALUDmxCtx *ctx, char *data, u32 size, Bool
25622562
if (ctx->hevc_state->sei.has_3d_ref_disp_info) {
25632563
naludmx_queue_param_set(ctx, data, size, GF_HEVC_NALU_SEI_PREFIX, 0, temporal_id, layer_id);
25642564
}
2565-
if (ctx->hevc_state->sei.alternative_transfer_characteristics) {
2565+
if (ctx->hevc_state->sei.alternative_transfer_characteristics && ctx->opid) {
25662566
gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER_ALT, & PROP_UINT(ctx->hevc_state->sei.alternative_transfer_characteristics) );
25672567
}
25682568
if (!ctx->nosei) {

0 commit comments

Comments
 (0)