summaryrefslogtreecommitdiff
path: root/libavformat/smoothstreamingenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-25 13:07:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-25 13:07:45 +0200
commitee9b0199c8433499ebcbdc66d3ecce379ad3209c (patch)
treef12f262dbe30e177ca948a9b2ad35e548145ee52 /libavformat/smoothstreamingenc.c
parent657c603263fb487790abf2d812022347a7bdcac3 (diff)
parente0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9 (diff)
Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'
* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9': smoothstream: check malloc calls Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smoothstreamingenc.c')
-rw-r--r--libavformat/smoothstreamingenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index fe18a95e48..6ce1937256 100644
--- 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)