diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:30:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:36:31 +0100 |
| commit | 1da83d52bc0f67597a6007a017f7a8118e848b71 (patch) | |
| tree | 94ff6f90120411df9377ea0d235ca1959011d92b | |
| parent | 564d943b2755a00df6857a86eb57101609f4b5a0 (diff) | |
| parent | b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc (diff) | |
| download | ffmpeg-1da83d52bc0f67597a6007a017f7a8118e848b71.tar.gz | |
Merge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4
* commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc':
rtsp: Check a memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index ce4763edee..eda49c137e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1150,6 +1150,8 @@ start: if (content_length > 0) { /* leave some room for a trailing '\0' (useful for simple parsing) */ content = av_malloc(content_length + 1); + if (!content) + return AVERROR(ENOMEM); ffurl_read_complete(rt->rtsp_hd, content, content_length); content[content_length] = '\0'; } |