Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:37:33 +0000 (21:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:37:48 +0000 (21:37 +0100)
* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/opt.c

index 92d1e39..c68dacc 100644 (file)
@@ -143,6 +143,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++);