[FFmpeg-cvslog] avcodec/dcadec: Check that the added xch channel isnt already there

2015-01-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Dec 
17 15:33:05 2014 +0100| [133dc77da96fe8c4ed042d7a2cce835ef5aba6c3] | committer: 
Michael Niedermayer

avcodec/dcadec: Check that the added xch channel isnt already there

Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 7d593495e42e92693cc8f3ce9b42cf3edcea377a)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dcadec.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 4392f03..c02d7a7 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2349,6 +2349,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #else
 if (s->xch_present && !s->xch_disable) {
 #endif
+if (avctx->channel_layout & AV_CH_BACK_CENTER) {
+avpriv_request_sample(avctx, "XCh with Back center 
channel");
+return AVERROR_INVALIDDATA;
+}
 avctx->channel_layout |= AV_CH_BACK_CENTER;
 if (s->lfe) {
 avctx->channel_layout |= AV_CH_LOW_FREQUENCY;

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

[FFmpeg-cvslog] avcodec/dcadec: Check that the added xch channel isnt already there

2015-01-06 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Wed Dec 
17 15:33:05 2014 +0100| [c8fb53357dbf15ed8cd881c4f810cd1170b1e501] | committer: 
Michael Niedermayer

avcodec/dcadec: Check that the added xch channel isnt already there

Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 7d593495e42e92693cc8f3ce9b42cf3edcea377a)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dcadec.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c671fcd..06fd74c 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2359,6 +2359,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #else
 if (s->xch_present && !s->xch_disable) {
 #endif
+if (avctx->channel_layout & AV_CH_BACK_CENTER) {
+avpriv_request_sample(avctx, "XCh with Back center 
channel");
+return AVERROR_INVALIDDATA;
+}
 avctx->channel_layout |= AV_CH_BACK_CENTER;
 if (s->lfe) {
 avctx->channel_layout |= AV_CH_LOW_FREQUENCY;

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

[FFmpeg-cvslog] avcodec/dcadec: Check that the added xch channel isnt already there

2014-12-21 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | Wed Dec 
17 15:33:05 2014 +0100| [5aead5ee053742717c7cb2ccaf3a34bcf8a67567] | committer: 
Michael Niedermayer

avcodec/dcadec: Check that the added xch channel isnt already there

Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 7d593495e42e92693cc8f3ce9b42cf3edcea377a)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dcadec.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index a36f69b..40d8e9e 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2360,6 +2360,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #else
 if (s->xch_present && !s->xch_disable) {
 #endif
+if (avctx->channel_layout & AV_CH_BACK_CENTER) {
+avpriv_request_sample(avctx, "XCh with Back center 
channel");
+return AVERROR_INVALIDDATA;
+}
 avctx->channel_layout |= AV_CH_BACK_CENTER;
 if (s->lfe) {
 avctx->channel_layout |= AV_CH_LOW_FREQUENCY;

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

[FFmpeg-cvslog] avcodec/dcadec: Check that the added xch channel isnt already there

2014-12-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | Wed Dec 
17 15:33:05 2014 +0100| [bd62554ad243a94ee483c48adac29297d16f9fa2] | committer: 
Michael Niedermayer

avcodec/dcadec: Check that the added xch channel isnt already there

Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 7d593495e42e92693cc8f3ce9b42cf3edcea377a)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/dcadec.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 82d96d2..7d798b0 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2359,6 +2359,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #else
 if (s->xch_present && !s->xch_disable) {
 #endif
+if (avctx->channel_layout & AV_CH_BACK_CENTER) {
+avpriv_request_sample(avctx, "XCh with Back center 
channel");
+return AVERROR_INVALIDDATA;
+}
 avctx->channel_layout |= AV_CH_BACK_CENTER;
 if (s->lfe) {
 avctx->channel_layout |= AV_CH_LOW_FREQUENCY;

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

[FFmpeg-cvslog] avcodec/dcadec: Check that the added xch channel isnt already there

2014-12-17 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 17 
15:33:05 2014 +0100| [7d593495e42e92693cc8f3ce9b42cf3edcea377a] | committer: 
Michael Niedermayer

avcodec/dcadec: Check that the added xch channel isnt already there

Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 

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

 libavcodec/dcadec.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index a36f69b..40d8e9e 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2360,6 +2360,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #else
 if (s->xch_present && !s->xch_disable) {
 #endif
+if (avctx->channel_layout & AV_CH_BACK_CENTER) {
+avpriv_request_sample(avctx, "XCh with Back center 
channel");
+return AVERROR_INVALIDDATA;
+}
 avctx->channel_layout |= AV_CH_BACK_CENTER;
 if (s->lfe) {
 avctx->channel_layout |= AV_CH_LOW_FREQUENCY;

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