Re: [libav-devel] [PATCH 1/1] mpjpgdec: free AVIOContext leak on early probe fail

2015-06-08 Thread Luca Barbato 
On 08/06/15 13:32, Janne Grunau wrote:
 ---
  libavformat/mpjpegdec.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
 index 354278c..72891e7 100644
 --- a/libavformat/mpjpegdec.c
 +++ b/libavformat/mpjpegdec.c
 @@ -88,7 +88,7 @@ static int mpjpeg_read_probe(AVProbeData *p)
  return AVERROR(ENOMEM);
  
  if (p-buf_size  2 || p-buf[0] != '-' || p-buf[1] != '-')
 -return 0;
 +goto end;
  
  while (!pb-eof_reached) {
  ret = get_line(pb, line, sizeof(line));
 @@ -101,7 +101,7 @@ static int mpjpeg_read_probe(AVProbeData *p)
  break;
  }
  }
 -
 +end:
  av_free(pb);
  
  return ret;
 

Ok.
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 1/1] mpjpgdec: free AVIOContext leak on early probe fail

2015-06-08 Thread Janne Grunau 
---
 libavformat/mpjpegdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index 354278c..72891e7 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -88,7 +88,7 @@ static int mpjpeg_read_probe(AVProbeData *p)
 return AVERROR(ENOMEM);
 
 if (p-buf_size  2 || p-buf[0] != '-' || p-buf[1] != '-')
-return 0;
+goto end;
 
 while (!pb-eof_reached) {
 ret = get_line(pb, line, sizeof(line));
@@ -101,7 +101,7 @@ static int mpjpeg_read_probe(AVProbeData *p)
 break;
 }
 }
-
+end:
 av_free(pb);
 
 return ret;
-- 
2.4.2

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel