[FFmpeg-cvslog] avcodec/xpmdec: Move allocations down after more error checks
ffmpeg | branch: release/4.4 | Michael Niedermayer |
Fri Sep 3 18:54:08 2021 +0200| [baefa5385e312bf8283880863f963f3a8fb7df02] |
committer: Michael Niedermayer
avcodec/xpmdec: Move allocations down after more error checks
Fixes: Timeout
Fixes:
37035/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XPM_fuzzer-5142718576721920
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol
Signed-off-by: Michael Niedermayer
(cherry picked from commit e58692837c20c8484a23cd9beb63ac422f82458a)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=baefa5385e312bf8283880863f963f3a8fb7df02
---
libavcodec/xpmdec.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c
index 922dfc0f67..993873c595 100644
--- a/libavcodec/xpmdec.c
+++ b/libavcodec/xpmdec.c
@@ -341,9 +341,6 @@ static int xpm_decode_frame(AVCodecContext *avctx, void
*data,
if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
return ret;
-if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
-return ret;
-
if (cpp <= 0 || cpp >= 5) {
av_log(avctx, AV_LOG_ERROR, "unsupported/invalid number of chars per
pixel: %d\n", cpp);
return AVERROR_INVALIDDATA;
@@ -360,14 +357,17 @@ static int xpm_decode_frame(AVCodecContext *avctx, void
*data,
size *= 4;
-av_fast_padded_malloc(>pixels, >pixels_size, size);
-if (!x->pixels)
-return AVERROR(ENOMEM);
-
ptr += mod_strcspn(ptr, ",") + 1;
if (end - ptr < 1)
return AVERROR_INVALIDDATA;
+if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
+return ret;
+
+av_fast_padded_malloc(>pixels, >pixels_size, size);
+if (!x->pixels)
+return AVERROR(ENOMEM);
+
for (i = 0; i < ncolors; i++) {
const uint8_t *index;
int len;
___
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/xpmdec: Move allocations down after more error checks
ffmpeg | branch: master | Michael Niedermayer | Fri
Sep 3 18:54:08 2021 +0200| [e58692837c20c8484a23cd9beb63ac422f82458a] |
committer: Michael Niedermayer
avcodec/xpmdec: Move allocations down after more error checks
Fixes: Timeout
Fixes:
37035/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XPM_fuzzer-5142718576721920
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e58692837c20c8484a23cd9beb63ac422f82458a
---
libavcodec/xpmdec.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c
index e609a70c6a..a11926ba28 100644
--- a/libavcodec/xpmdec.c
+++ b/libavcodec/xpmdec.c
@@ -341,9 +341,6 @@ static int xpm_decode_frame(AVCodecContext *avctx, void
*data,
if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
return ret;
-if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
-return ret;
-
if (cpp <= 0 || cpp >= 5) {
av_log(avctx, AV_LOG_ERROR, "unsupported/invalid number of chars per
pixel: %d\n", cpp);
return AVERROR_INVALIDDATA;
@@ -360,14 +357,17 @@ static int xpm_decode_frame(AVCodecContext *avctx, void
*data,
size *= 4;
-av_fast_padded_malloc(>pixels, >pixels_size, size);
-if (!x->pixels)
-return AVERROR(ENOMEM);
-
ptr += mod_strcspn(ptr, ",") + 1;
if (end - ptr < 1)
return AVERROR_INVALIDDATA;
+if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
+return ret;
+
+av_fast_padded_malloc(>pixels, >pixels_size, size);
+if (!x->pixels)
+return AVERROR(ENOMEM);
+
for (i = 0; i < ncolors; i++) {
const uint8_t *index;
int len;
___
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".
