[FFmpeg-cvslog] opt: check memory allocation

[Vittorio Giovara]

ffmpeg | branch: release/1.2 | Vittorio Giovara <vittorio.giovara at gmail.com> | Thu Dec 18 20:26:57 2014 +0100| [71bdcd66e15a92933ad6ca9d9ad9951bf46b7bee] | committer: Michael Niedermayer

opt: check memory allocation

Bug-Id: CID 1257771
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71bdcd66e15a92933ad6ca9d9ad9951bf46b7bee
---

 libavutil/opt.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 4100d02..5b88b28 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -149,6 +149,8 @@ static int set_string_binary(void *obj, const AVOption *o, const char *val, uint
     len /= 2;
 
     ptr = bin = av_malloc(len);
+    if (!ptr)
+        return AVERROR(ENOMEM);
     while (*val) {
         int a = hexchar2int(*val++);
         int b = hexchar2int(*val++);