[FFmpeg-cvslog] opt: check memory allocation

[Vittorio Giovara]

ffmpeg | branch: release/2.4 | Vittorio Giovara <vittorio.giovara at gmail.com> | Thu Dec 18 20:26:57 2014 +0100| [61335ab33e594d47b84fde7367ee10dc66fc3465] | committer: Luca Barbato

opt: check memory allocation

CC: libav-stable at libav.org
Bug-Id: CID 1257771
(cherry picked from commit 07a0c0f0005072d115ace61e60f46be68582cc3a)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

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

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 28adef6..059c525 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -119,6 +119,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++);