diff mbox

[FFmpeg-devel,2/3] af_hdcd: check return value of av_frame_copy_props()

Message ID 1471906881-10946-3-git-send-email-pburt0@gmail.com
State Accepted
Commit 8a78fc5b015f34e0a0c877b4b22b33fb961f847b
Headers show

Commit Message

Burt P Aug. 22, 2016, 11:01 p.m. UTC 
Anton Khirnov:
"[av_frame_copy_props()] potentially contains memory allocation,
so the return value needs to be checked."

Signed-off-by: Burt P <pburt0@gmail.com>
---
 libavfilter/af_hdcd.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Burt P Aug. 24, 2016, 2:11 p.m. UTC | #1 
applied

--
Burt
diff mbox

Patch

diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index 1bcd279..2324dc3 100644
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -1530,14 +1530,18 @@  static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     AVFrame *out;
     const int16_t *in_data;
     int32_t *out_data;
-    int n, c;
+    int n, c, result;
 
     out = ff_get_audio_buffer(outlink, in->nb_samples);
     if (!out) {
         av_frame_free(&in);
         return AVERROR(ENOMEM);
     }
-    av_frame_copy_props(out, in);
+    result = av_frame_copy_props(out, in);
+    if (result) {
+        av_frame_free(&in);
+        return result;
+    }
     out->format = outlink->format;
 
     in_data  = (int16_t*)in->data[0];