mirror of https://git.ffmpeg.org/ffmpeg.git
ffserver: initialize pbuffer in prepare_sdp_description()
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:
parent
7d69132775
commit
150ae7692e
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue