[FFmpeg-cvslog] avcodec/pgssubdec: Check for duplicate display segments

2019-05-10 Thread Michael Niedermayer 
ffmpeg | branch: release/3.2 | Michael Niedermayer  | 
Tue Jan 29 01:06:01 2019 +0100| [98b5ec4bc0efbb232305fa0e71f13013ea1dd813] | 
committer: Michael Niedermayer

avcodec/pgssubdec: Check for duplicate display segments

In such a duplication the previous gets overwritten and leaks

Fixes: memleak
Fixes: 
12510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGSSUB_fuzzer-5694439226343424

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e35c3d887b3e374c6a091342206a42da48785d70)
Signed-off-by: Michael Niedermayer 

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

 libavcodec/pgssubdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index b897d72aab..8c10f6d573 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -676,6 +676,11 @@ static int decode(AVCodecContext *avctx, void *data, int 
*data_size,
  */
 break;
 case DISPLAY_SEGMENT:
+if (*data_size) {
+av_log(avctx, AV_LOG_ERROR, "Duplicate display segment\n");
+ret = AVERROR_INVALIDDATA;
+break;
+}
 ret = display_end_segment(avctx, data, buf, segment_length);
 if (ret >= 0)
 *data_size = ret;

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

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/pgssubdec: Check for duplicate display segments

2019-03-28 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Tue Jan 29 01:06:01 2019 +0100| [4946bda47302276e09000c0cd011e8327230d440] | 
committer: Michael Niedermayer

avcodec/pgssubdec: Check for duplicate display segments

In such a duplication the previous gets overwritten and leaks

Fixes: memleak
Fixes: 
12510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGSSUB_fuzzer-5694439226343424

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e35c3d887b3e374c6a091342206a42da48785d70)
Signed-off-by: Michael Niedermayer 

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

 libavcodec/pgssubdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index b897d72aab..8c10f6d573 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -676,6 +676,11 @@ static int decode(AVCodecContext *avctx, void *data, int 
*data_size,
  */
 break;
 case DISPLAY_SEGMENT:
+if (*data_size) {
+av_log(avctx, AV_LOG_ERROR, "Duplicate display segment\n");
+ret = AVERROR_INVALIDDATA;
+break;
+}
 ret = display_end_segment(avctx, data, buf, segment_length);
 if (ret >= 0)
 *data_size = ret;

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

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/pgssubdec: Check for duplicate display segments

2019-03-21 Thread Michael Niedermayer 
ffmpeg | branch: release/4.0 | Michael Niedermayer  | 
Tue Jan 29 01:06:01 2019 +0100| [b9269c960cae81b5cc503e6629892894380a5527] | 
committer: Michael Niedermayer

avcodec/pgssubdec: Check for duplicate display segments

In such a duplication the previous gets overwritten and leaks

Fixes: memleak
Fixes: 
12510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGSSUB_fuzzer-5694439226343424

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e35c3d887b3e374c6a091342206a42da48785d70)
Signed-off-by: Michael Niedermayer 

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

 libavcodec/pgssubdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index b897d72aab..8c10f6d573 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -676,6 +676,11 @@ static int decode(AVCodecContext *avctx, void *data, int 
*data_size,
  */
 break;
 case DISPLAY_SEGMENT:
+if (*data_size) {
+av_log(avctx, AV_LOG_ERROR, "Duplicate display segment\n");
+ret = AVERROR_INVALIDDATA;
+break;
+}
 ret = display_end_segment(avctx, data, buf, segment_length);
 if (ret >= 0)
 *data_size = ret;

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

[FFmpeg-cvslog] avcodec/pgssubdec: Check for duplicate display segments

2019-02-03 Thread Michael Niedermayer 
ffmpeg | branch: release/4.1 | Michael Niedermayer  | 
Tue Jan 29 01:06:01 2019 +0100| [7816497ba081003287557096eea830327281f15d] | 
committer: Michael Niedermayer

avcodec/pgssubdec: Check for duplicate display segments

In such a duplication the previous gets overwritten and leaks

Fixes: memleak
Fixes: 
12510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGSSUB_fuzzer-5694439226343424

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e35c3d887b3e374c6a091342206a42da48785d70)
Signed-off-by: Michael Niedermayer 

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

 libavcodec/pgssubdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index b897d72aab..8c10f6d573 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -676,6 +676,11 @@ static int decode(AVCodecContext *avctx, void *data, int 
*data_size,
  */
 break;
 case DISPLAY_SEGMENT:
+if (*data_size) {
+av_log(avctx, AV_LOG_ERROR, "Duplicate display segment\n");
+ret = AVERROR_INVALIDDATA;
+break;
+}
 ret = display_end_segment(avctx, data, buf, segment_length);
 if (ret >= 0)
 *data_size = ret;

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

[FFmpeg-cvslog] avcodec/pgssubdec: Check for duplicate display segments

2019-02-03 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue 
Jan 29 01:06:01 2019 +0100| [e35c3d887b3e374c6a091342206a42da48785d70] | 
committer: Michael Niedermayer

avcodec/pgssubdec: Check for duplicate display segments

In such a duplication the previous gets overwritten and leaks

Fixes: memleak
Fixes: 
12510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGSSUB_fuzzer-5694439226343424

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

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

 libavcodec/pgssubdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index b897d72aab..8c10f6d573 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -676,6 +676,11 @@ static int decode(AVCodecContext *avctx, void *data, int 
*data_size,
  */
 break;
 case DISPLAY_SEGMENT:
+if (*data_size) {
+av_log(avctx, AV_LOG_ERROR, "Duplicate display segment\n");
+ret = AVERROR_INVALIDDATA;
+break;
+}
 ret = display_end_segment(avctx, data, buf, segment_length);
 if (ret >= 0)
 *data_size = ret;

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