On Sat, Aug 02, 2014 at 04:51:16PM +0200, Stefano Sabatini wrote:
> 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 <michae...@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.applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User questions about the command line tools should be sent to the ffmpeg-user ML. And questions about how to use libav* should be sent to the libav-user ML.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
