Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'

* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9': smoothstream: check malloc calls Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · ee9b0199c8
parent 657c603263 e0d01dc7d7
commit ee9b0199c8
1 changed files with 2 additions and 0 deletions
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@ -154,6 +154,8 @@ static void get_private_data(OutputStream *os)
    if (!ptr)
        return;
    os->private_str = av_mallocz(2*size + 1);
+    if (!os->private_str)
+        return;
    for (i = 0; i < size; i++)
        snprintf(&os->private_str[2*i], 3, "%02x", ptr[i]);
    if (ptr != codec->extradata)