[FFmpeg-devel] [PATCH] ffserver: initialize pbuffer in prepare_sdp_description()

Stefano Sabatini stefasab at gmail.com
Sat Aug 2 16:51:16 CEST 2014


On date Saturday 2014-08-02 14:25:21 +0200, Michael Niedermayer encoded:
> also check pbuffer before use
> 
> Found-by: CSA
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  ffserver.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/ffserver.c b/ffserver.c
> index 00153b4..956d9f5 100644
> --- a/ffserver.c
> +++ b/ffserver.c
> @@ -2977,6 +2977,8 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
>      AVDictionaryEntry *entry = av_dict_get(stream->metadata, "title", NULL, 0);
>      int i;
>  
> +    *pbuffer = NULL;
> +
>      avc =  avformat_alloc_context();
>      if (avc == NULL || !rtp_format) {
>          return -1;
> @@ -3013,7 +3015,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
>      av_free(avc);
>      av_free(avs);
>  
> -    return strlen(*pbuffer);
> +    return *pbuffer ? strlen(*pbuffer) : AVERROR(ENOMEM);
>  }
>  
>  static void rtsp_cmd_options(HTTPContext *c, const char *url)

LGTM.
-- 
FFmpeg = Faithless Fostering Magnificient Portable Egregious Geek


More information about the ffmpeg-devel mailing list