[FFmpeg-cvslog] avcodec/dpx: Move need_align to act per line

2015-12-06 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | 
Sat Nov 14 14:29:02 2015 +0100| [99e080ec38eec8e8e0ca3b404d86c4526ed57d74] | 
committer: Michael Niedermayer

avcodec/dpx: Move need_align to act per line

Fixes out of array read
Fixes: 
61cf123c081ee2bb774d307c75bdb99e/asan_heap-oob_1224f76_5546_bee833ffae73f752b489b9eeaac52db7.dpx

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dpx.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 5d8c4f3..02aa779 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -334,11 +334,11 @@ static int decode_frame(AVCodecContext *avctx,
 // For 12 bit, ignore alpha
 if (elements == 4)
 buf += 2;
-// Jump to next aligned position
-buf += need_align;
 }
 for (i = 0; i < 3; i++)
 ptr[i] += p->linesize[i];
+// Jump to next aligned position
+buf += need_align;
 }
 break;
 case 16:

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

[FFmpeg-cvslog] avcodec/dpx: Move need_align to act per line

2015-11-26 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | 
Sat Nov 14 14:29:02 2015 +0100| [19c931fe66bc2c524fdafdfb92484ee746ad36f9] | 
committer: Michael Niedermayer

avcodec/dpx: Move need_align to act per line

Fixes out of array read
Fixes: 
61cf123c081ee2bb774d307c75bdb99e/asan_heap-oob_1224f76_5546_bee833ffae73f752b489b9eeaac52db7.dpx

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dpx.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 3b78486..60f5107 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -334,11 +334,11 @@ static int decode_frame(AVCodecContext *avctx,
 // For 12 bit, ignore alpha
 if (elements == 4)
 buf += 2;
-// Jump to next aligned position
-buf += need_align;
 }
 for (i = 0; i < 3; i++)
 ptr[i] += p->linesize[i];
+// Jump to next aligned position
+buf += need_align;
 }
 break;
 case 16:

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

[FFmpeg-cvslog] avcodec/dpx: Move need_align to act per line

2015-11-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer  | 
Sat Nov 14 14:29:02 2015 +0100| [7ab1f5b0d4b621dbd78bc901d38fcad6e19c375e] | 
committer: Michael Niedermayer

avcodec/dpx: Move need_align to act per line

Fixes out of array read
Fixes: 
61cf123c081ee2bb774d307c75bdb99e/asan_heap-oob_1224f76_5546_bee833ffae73f752b489b9eeaac52db7.dpx

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dpx.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 66d8428..3b45b8e 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -348,11 +348,11 @@ static int decode_frame(AVCodecContext *avctx,
 // For 12 bit, ignore alpha
 if (elements == 4)
 buf += 2;
-// Jump to next aligned position
-buf += need_align;
 }
 for (i = 0; i < 3; i++)
 ptr[i] += p->linesize[i];
+// Jump to next aligned position
+buf += need_align;
 }
 break;
 case 16:

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

[FFmpeg-cvslog] avcodec/dpx: Move need_align to act per line

2015-11-18 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer  | 
Sat Nov 14 14:29:02 2015 +0100| [d61c3d1fca62b2497e4327af3ea50de5f7a8de0f] | 
committer: Michael Niedermayer

avcodec/dpx: Move need_align to act per line

Fixes out of array read
Fixes: 
61cf123c081ee2bb774d307c75bdb99e/asan_heap-oob_1224f76_5546_bee833ffae73f752b489b9eeaac52db7.dpx

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dpx.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 66d8428..3b45b8e 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -348,11 +348,11 @@ static int decode_frame(AVCodecContext *avctx,
 // For 12 bit, ignore alpha
 if (elements == 4)
 buf += 2;
-// Jump to next aligned position
-buf += need_align;
 }
 for (i = 0; i < 3; i++)
 ptr[i] += p->linesize[i];
+// Jump to next aligned position
+buf += need_align;
 }
 break;
 case 16:

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

[FFmpeg-cvslog] avcodec/dpx: Move need_align to act per line

2015-11-14 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Nov 14 14:29:02 2015 +0100| [c8aaae8e0f1519bc99bd717ea3067c9cfdb68def] | 
committer: Michael Niedermayer

avcodec/dpx: Move need_align to act per line

Fixes out of array read
Fixes: 
61cf123c081ee2bb774d307c75bdb99e/asan_heap-oob_1224f76_5546_bee833ffae73f752b489b9eeaac52db7.dpx

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

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

 libavcodec/dpx.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 15c939f..af7276a 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -348,11 +348,11 @@ static int decode_frame(AVCodecContext *avctx,
 // For 12 bit, ignore alpha
 if (elements == 4)
 buf += 2;
-// Jump to next aligned position
-buf += need_align;
 }
 for (i = 0; i < 3; i++)
 ptr[i] += p->linesize[i];
+// Jump to next aligned position
+buf += need_align;
 }
 break;
 case 16:

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