[FFmpeg-cvslog] avcodec/hevc_ps: fix the problem of memcmp losing effectiveness
ffmpeg | branch: release/7.0 | Tong Wu | Fri Mar 29
23:31:20 2024 +0800| [7fa569e34d448c4a3a19fc0e5c7a74cfc9f6be59] | committer:
James Almer
avcodec/hevc_ps: fix the problem of memcmp losing effectiveness
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
Signed-off-by: Tong Wu
Signed-off-by: James Almer
(cherry picked from commit 6bf17136a2bc1e6f52ea9cd27a6dcaab648efe5c)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fa569e34d448c4a3a19fc0e5c7a74cfc9f6be59
---
libavcodec/hevc_ps.c | 19 +++
libavcodec/hevc_ps.h | 4 +++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index cbef3ef4cd..6475d86d7d 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -449,6 +449,15 @@ static void uninit_vps(FFRefStructOpaque opaque, void *obj)
av_freep(>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,
HEVCParamSets *ps)
{
@@ -545,9 +554,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb,
AVCodecContext *avctx,
goto err;
}
-vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr));
-if (!vps->hdr)
-goto err;
+if (vps->vps_num_hrd_parameters) {
+vps->hdr = av_calloc(vps->vps_num_hrd_parameters,
sizeof(*vps->hdr));
+if (!vps->hdr)
+goto err;
+}
for (i = 0; i < vps->vps_num_hrd_parameters; i++) {
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] &&
-!memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) {
+compare_vps(ps->vps_list[vps_id], vps)) {
ff_refstruct_unref();
} else {
remove_vps(ps, vps_id);
diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h
index cc75aeb8d3..0d8eaf2b3e 100644
--- a/libavcodec/hevc_ps.h
+++ b/libavcodec/hevc_ps.h
@@ -153,7 +153,6 @@ typedef struct PTL {
typedef struct HEVCVPS {
unsigned int vps_id;
-HEVCHdrParams *hdr;
uint8_t vps_temporal_id_nesting_flag;
int vps_max_layers;
@@ -175,6 +174,9 @@ typedef struct HEVCVPS {
uint8_t data[4096];
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;
typedef struct ScalingList {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/hevc_ps: fix the problem of memcmp losing effectiveness
ffmpeg | branch: master | Tong Wu | Fri Mar 29 23:31:20
2024 +0800| [6bf17136a2bc1e6f52ea9cd27a6dcaab648efe5c] | committer: James Almer
avcodec/hevc_ps: fix the problem of memcmp losing effectiveness
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
Signed-off-by: Tong Wu
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bf17136a2bc1e6f52ea9cd27a6dcaab648efe5c
---
libavcodec/hevc_ps.c | 19 +++
libavcodec/hevc_ps.h | 4 +++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index cbef3ef4cd..6475d86d7d 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -449,6 +449,15 @@ static void uninit_vps(FFRefStructOpaque opaque, void *obj)
av_freep(>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,
HEVCParamSets *ps)
{
@@ -545,9 +554,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb,
AVCodecContext *avctx,
goto err;
}
-vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr));
-if (!vps->hdr)
-goto err;
+if (vps->vps_num_hrd_parameters) {
+vps->hdr = av_calloc(vps->vps_num_hrd_parameters,
sizeof(*vps->hdr));
+if (!vps->hdr)
+goto err;
+}
for (i = 0; i < vps->vps_num_hrd_parameters; i++) {
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] &&
-!memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) {
+compare_vps(ps->vps_list[vps_id], vps)) {
ff_refstruct_unref();
} else {
remove_vps(ps, vps_id);
diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h
index cc75aeb8d3..0d8eaf2b3e 100644
--- a/libavcodec/hevc_ps.h
+++ b/libavcodec/hevc_ps.h
@@ -153,7 +153,6 @@ typedef struct PTL {
typedef struct HEVCVPS {
unsigned int vps_id;
-HEVCHdrParams *hdr;
uint8_t vps_temporal_id_nesting_flag;
int vps_max_layers;
@@ -175,6 +174,9 @@ typedef struct HEVCVPS {
uint8_t data[4096];
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;
typedef struct ScalingList {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
