subject:"\[FFmpeg\-cvslog\] avcodec\/vmdvideo\: Check len before using it in method 3"

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2015-03-12 Thread Michael Niedermayer

ffmpeg | branch: release/0.10 | Michael Niedermayer  | Tue 
Dec 16 16:24:55 2014 +0100| [87ec3c615689e3d8bce36f1a168d908c7502b867] | 
committer: Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Conflicts:

libavcodec/vmdav.c

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

 libavcodec/vmdav.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 1e5f2ca..2b491ad 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -319,8 +319,12 @@ static void vmd_decode(VmdVideoContext *s)
 len = rle_unpack(gb.buffer, &dp[ofs],
  len, 
bytestream2_get_bytes_left(&gb),
  frame_width - ofs);
-else
+else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
+}
 bytestream2_skip(&gb, len);
 } else {
 /* interframe pixel copy */

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2015-03-11 Thread Michael Niedermayer

ffmpeg | branch: release/0.7 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [fac6f744d8170585f05e098ce9c9f27eeffa818e] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Conflicts:

libavcodec/vmdvideo.c

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

 libavcodec/vmdav.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 1f9694e..94ae895 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -339,7 +339,7 @@ static void vmd_decode(VmdVideoContext *s)
 if (*pb++ == 0xFF)
 len = rle_unpack(pb, pb_end - pb, len, &dp[ofs], 
frame_width - ofs);
 else {
-if (pb_end - pb < len)
+if (ofs + len > frame_width || pb_end - pb < len)
 return;
 memcpy(&dp[ofs], pb, len);
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2015-01-19 Thread Michael Niedermayer

ffmpeg | branch: release/2.2 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [7279be7c75c38547994466b6f95bc3cadb05238b] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/vmdav.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index c1fb80b..91d245a 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -352,6 +352,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 ofs += slen;
 bytestream2_skip(&gb, len);
 } else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
 ofs += len;
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2015-01-06 Thread Michael Niedermayer

ffmpeg | branch: release/2.3 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [942806cbe41e2d25bf1d25fa97b9fe04885afb77] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/vmdvideo.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c
index 279c56a..42e19ae 100644
--- a/libavcodec/vmdvideo.c
+++ b/libavcodec/vmdvideo.c
@@ -339,6 +339,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 ofs += slen;
 bytestream2_skip(&gb, len);
 } else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
 ofs += len;
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2014-12-30 Thread Michael Niedermayer

ffmpeg | branch: release/2.1 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [96981b092c0971ac4c572692141cda87f5371989] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/vmdav.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 36d60ee..8710f33 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -348,6 +348,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 ofs += slen;
 bytestream2_skip(&gb, len);
 } else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
 ofs += len;
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2014-12-21 Thread Michael Niedermayer

ffmpeg | branch: release/2.5 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [b850b01533b8e153d9dde5014d2a0e8f366fdd31] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/vmdvideo.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c
index fa0fbe3..a2ba1c9 100644
--- a/libavcodec/vmdvideo.c
+++ b/libavcodec/vmdvideo.c
@@ -339,6 +339,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 ofs += slen;
 bytestream2_skip(&gb, len);
 } else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
 ofs += len;
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2014-12-20 Thread Michael Niedermayer

ffmpeg | branch: release/1.1 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [24fefa73dba44d07b4cef8b6243cfa37f6ec3e54] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Conflicts:

libavcodec/vmdav.c

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

 libavcodec/vmdav.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 9c24a01..f17bd49 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -340,8 +340,12 @@ static int vmd_decode(VmdVideoContext *s)
 len = rle_unpack(gb.buffer, &dp[ofs],
  len, bytestream2_get_bytes_left(&gb),
  frame_width - ofs);
-else
+else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
+}
 bytestream2_skip(&gb, len);
 } else {
 /* interframe pixel copy */

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2014-12-19 Thread Michael Niedermayer

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [195e8ecacc8b81b71e86d283ce7742bbdc230826] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/vmdvideo.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c
index fa0fbe3..a2ba1c9 100644
--- a/libavcodec/vmdvideo.c
+++ b/libavcodec/vmdvideo.c
@@ -339,6 +339,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 ofs += slen;
 bytestream2_skip(&gb, len);
 } else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
 ofs += len;
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2014-12-18 Thread Michael Niedermayer

ffmpeg | branch: release/1.2 | Michael Niedermayer  | Tue Dec 
16 16:24:55 2014 +0100| [0da0d7754e745d066f845da499383ff86d2ce04f] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Conflicts:

libavcodec/vmdvideo.c

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

 libavcodec/vmdav.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 79a33b8..773ca88 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -343,7 +343,7 @@ static void vmd_decode(VmdVideoContext *s)
 if (*pb++ == 0xFF)
 len = rle_unpack(pb, pb_end - pb, len, &dp[ofs], 
frame_width - ofs);
 else {
-if (pb_end - pb < len)
+if (ofs + len > frame_width || pb_end - pb < len)
 return;
 memcpy(&dp[ofs], pb, len);
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

2014-12-16 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Tue Dec 16 
16:24:55 2014 +0100| [3030fb7e0d41836f8add6399e9a7c7b740b48bfd] | committer: 
Michael Niedermayer

avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 

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

 libavcodec/vmdvideo.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c
index fa0fbe3..a2ba1c9 100644
--- a/libavcodec/vmdvideo.c
+++ b/libavcodec/vmdvideo.c
@@ -339,6 +339,9 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 ofs += slen;
 bytestream2_skip(&gb, len);
 } else {
+if (ofs + len > frame_width ||
+bytestream2_get_bytes_left(&gb) < len)
+return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&gb, &dp[ofs], len);
 ofs += len;
 }

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

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

[FFmpeg-cvslog] avcodec/vmdvideo: Check len before using it in method 3

10 matches

Site Navigation

Mail list logo

Footer information