[FFmpeg-cvslog] mov: avoid a memleak when multiple stss boxes are present

2015-03-11 Thread Anton Khirnov
ffmpeg | branch: release/0.10 | Anton Khirnov  | Tue Aug 12 
14:39:10 2014 +| [0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48] | committer: 
Anton Khirnov

mov: avoid a memleak when multiple stss boxes are present

CC: libav-sta...@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 64f7575fbd64e5b65d5c644347408588c776f1fe)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 577f1feb3fd1e51fd14af7ce6d79d468faa3b929)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 931f5b235112f1c2a09dead36f0a228061d23942)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 93f919d0b4c4341ccee366c98ac9af813f8fe622)
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48
---

 libavformat/mov.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index d59a66e..a1de652 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1523,6 +1523,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 return 0;
 if (entries >= UINT_MAX / sizeof(int))
 return AVERROR_INVALIDDATA;
+av_freep(&sc->keyframes);
 sc->keyframes = av_malloc(entries * sizeof(int));
 if (!sc->keyframes)
 return AVERROR(ENOMEM);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] mov: avoid a memleak when multiple stss boxes are present

2014-12-20 Thread Anton Khirnov
ffmpeg | branch: release/1.1 | Anton Khirnov  | Tue Aug 12 
14:39:10 2014 +| [93f919d0b4c4341ccee366c98ac9af813f8fe622] | committer: 
Anton Khirnov

mov: avoid a memleak when multiple stss boxes are present

CC: libav-sta...@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 64f7575fbd64e5b65d5c644347408588c776f1fe)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 577f1feb3fd1e51fd14af7ce6d79d468faa3b929)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 931f5b235112f1c2a09dead36f0a228061d23942)
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93f919d0b4c4341ccee366c98ac9af813f8fe622
---

 libavformat/mov.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4453d6d..e2d3f93 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1530,6 +1530,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 }
 if (entries >= UINT_MAX / sizeof(int))
 return AVERROR_INVALIDDATA;
+av_freep(&sc->keyframes);
 sc->keyframes = av_malloc(entries * sizeof(int));
 if (!sc->keyframes)
 return AVERROR(ENOMEM);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] mov: avoid a memleak when multiple stss boxes are present

2014-12-20 Thread Anton Khirnov
ffmpeg | branch: release/2.2 | Anton Khirnov  | Tue Aug 12 
14:39:10 2014 +| [931f5b235112f1c2a09dead36f0a228061d23942] | committer: 
Anton Khirnov

mov: avoid a memleak when multiple stss boxes are present

CC: libav-sta...@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 64f7575fbd64e5b65d5c644347408588c776f1fe)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 577f1feb3fd1e51fd14af7ce6d79d468faa3b929)
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=931f5b235112f1c2a09dead36f0a228061d23942
---

 libavformat/mov.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6f72ce8..5ef343e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1598,6 +1598,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 }
 if (entries >= UINT_MAX / sizeof(int))
 return AVERROR_INVALIDDATA;
+av_freep(&sc->keyframes);
 sc->keyframes = av_malloc(entries * sizeof(int));
 if (!sc->keyframes)
 return AVERROR(ENOMEM);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] mov: avoid a memleak when multiple stss boxes are present

2014-12-20 Thread Anton Khirnov
ffmpeg | branch: release/2.4 | Anton Khirnov  | Tue Aug 12 
14:39:10 2014 +| [577f1feb3fd1e51fd14af7ce6d79d468faa3b929] | committer: 
Anton Khirnov

mov: avoid a memleak when multiple stss boxes are present

CC: libav-sta...@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 64f7575fbd64e5b65d5c644347408588c776f1fe)
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=577f1feb3fd1e51fd14af7ce6d79d468faa3b929
---

 libavformat/mov.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3734689..9077b7d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1702,6 +1702,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 }
 if (entries >= UINT_MAX / sizeof(int))
 return AVERROR_INVALIDDATA;
+av_freep(&sc->keyframes);
 sc->keyframes = av_malloc(entries * sizeof(int));
 if (!sc->keyframes)
 return AVERROR(ENOMEM);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog


[FFmpeg-cvslog] mov: avoid a memleak when multiple stss boxes are present

2014-12-19 Thread Anton Khirnov
ffmpeg | branch: master | Anton Khirnov  | Tue Aug 12 
14:39:10 2014 +| [64f7575fbd64e5b65d5c644347408588c776f1fe] | committer: 
Anton Khirnov

mov: avoid a memleak when multiple stss boxes are present

CC: libav-sta...@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64f7575fbd64e5b65d5c644347408588c776f1fe
---

 libavformat/mov.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4590a2d..aa81661 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1819,6 +1819,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 }
 if (entries >= UINT_MAX / sizeof(int))
 return AVERROR_INVALIDDATA;
+av_freep(&sc->keyframes);
 sc->keyframes = av_malloc(entries * sizeof(int));
 if (!sc->keyframes)
 return AVERROR(ENOMEM);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog