RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-06 15:21:15 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/hevc_ps: fix the problem of memcmp losing effectiveness

Browse Source 
HEVCHdrParams* receives a pointer which points to a dynamically
allocated memory block. It causes the memcmp always returning 1.
Add a function to do the comparision. A condition is also added to
avoid malloc(0).

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Tong Wu <tong1.wu@intel.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Tong Wu 2024-03-29 23:31:20 +08:00 committed by James Almer
parent fa110c32b5
commit 6bf17136a2
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/hevc_ps.c
View File

@ -449,6 +449,15 @@ static void uninit_vps(FFRefStructOpaque opaque, void *obj)
av_freep(&vps->hdr); av_freep(&vps->hdr);
} }
static int compare_vps(const HEVCVPS *vps1, const HEVCVPS *vps2)
{
if (!memcmp(vps1, vps2, offsetof(HEVCVPS, hdr)))
return !vps1->vps_num_hrd_parameters ||
!memcmp(vps1->hdr, vps2->hdr, vps1->vps_num_hrd_parameters * sizeof(*vps1->hdr));
return 0;
}
int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
HEVCParamSets *ps) HEVCParamSets *ps)
{ {
@ -545,9 +554,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
goto err; goto err;
} }
vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); if (vps->vps_num_hrd_parameters) {
if (!vps->hdr) vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr));
goto err; if (!vps->hdr)
goto err;
}
for (i = 0; i < vps->vps_num_hrd_parameters; i++) { for (i = 0; i < vps->vps_num_hrd_parameters; i++) {
int common_inf_present = 1; int common_inf_present = 1;
@ -569,7 +580,7 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
} }
if (ps->vps_list[vps_id] && if (ps->vps_list[vps_id] &&
!memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) { compare_vps(ps->vps_list[vps_id], vps)) {
ff_refstruct_unref(&vps); ff_refstruct_unref(&vps);
} else { } else {
remove_vps(ps, vps_id); remove_vps(ps, vps_id);

4
libavcodec/hevc_ps.h
View File

@ -153,7 +153,6 @@ typedef struct PTL {
typedef struct HEVCVPS { typedef struct HEVCVPS {
unsigned int vps_id; unsigned int vps_id;
HEVCHdrParams *hdr;
uint8_t vps_temporal_id_nesting_flag; uint8_t vps_temporal_id_nesting_flag;
int vps_max_layers; int vps_max_layers;
@ -175,6 +174,9 @@ typedef struct HEVCVPS {
uint8_t data[4096]; uint8_t data[4096];
int data_size; int data_size;
/* Put this at the end of the structure to make it easier to calculate the
* size before this pointer, which is used for memcmp */
HEVCHdrParams *hdr;
} HEVCVPS; } HEVCVPS;
typedef struct ScalingList { typedef struct ScalingList {