RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9' 

* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-25 13:07:27 +02:00
parent 657c603263 e0d01dc7d7
commit ee9b0199c8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/smoothstreamingenc.c
View File

@ -154,6 +154,8 @@ static void get_private_data(OutputStream *os)
if (!ptr) if (!ptr)
return; return;
os->private_str = av_mallocz(2*size + 1); os->private_str = av_mallocz(2*size + 1);
if (!os->private_str)
return;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
snprintf(&os->private_str[2*i], 3, "%02x", ptr[i]); snprintf(&os->private_str[2*i], 3, "%02x", ptr[i]);
if (ptr != codec->extradata) if (ptr != codec->extradata)