diff mbox series

[FFmpeg-devel,14/30] lavc/libx264: do not leave an invalid array size on alloc error

Message ID 20221127170351.11477-14-anton@khirnov.net
State Accepted
Commit 7399e5305ca9a77ea4d3ffa692477a330d7d2c08
Headers show
Series [FFmpeg-devel,01/30] lavc/libx264: factor out setting up the input frame | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

Anton Khirnov Nov. 27, 2022, 5:03 p.m. UTC 
---
 libavcodec/libx264.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index a1b044d4e9..2bbd9044b6 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1107,8 +1107,10 @@  static av_cold int X264_init(AVCodecContext *avctx)
     x4->nb_reordered_opaque = x264_encoder_maximum_delayed_frames(x4->enc) + 17;
     x4->reordered_opaque    = av_calloc(x4->nb_reordered_opaque,
                                         sizeof(*x4->reordered_opaque));
-    if (!x4->reordered_opaque)
+    if (!x4->reordered_opaque) {
+        x4->nb_reordered_opaque = 0;
         return AVERROR(ENOMEM);
+    }
 
     return 0;
 }