generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffserver: initialize pbuffer in prepare_sdp_description()

Browse Source 
also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d8d21b90a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-02 14:03:30 +02:00
parent 7d69132775
commit 150ae7692e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffserver.c
View File

@@ -2972,6 +2972,8 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
int i; int i;
*pbuffer = NULL;
avc = avformat_alloc_context(); avc = avformat_alloc_context();
if (avc == NULL || !rtp_format) { if (avc == NULL || !rtp_format) {
return -1; return -1;
@@ -3008,7 +3010,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
av_free(avc); av_free(avc);
av_free(avs); av_free(avs);
return strlen(*pbuffer); return *pbuffer ? strlen(*pbuffer) : AVERROR(ENOMEM);
} }
static void rtsp_cmd_options(HTTPContext *c, const char *url) static void rtsp_cmd_options(HTTPContext *c, const char *url)