Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'

* commit '07a0c0f0005072d115ace61e60f46be68582cc3a': opt: check memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 21:37:33 +01:00 · 2015-01-06 21:37:33 +01:00 · b20e79dbe9
parent dede2f7fc4 07a0c0f000
commit b20e79dbe9
1 changed files with 2 additions and 0 deletions
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@ -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++);