[FFmpeg-cvslog] libavutil/base64: Try not to write over the array end
ffmpeg | branch: release/4.3 | Michael Niedermayer | Sat May 11 03:13:17 2024 +0200| [ef80220f32783cc4608754d1df5945bdb5b34209] | committer: Michael Niedermayer libavutil/base64: Try not to write over the array end Signed-off-by: Michael Niedermayer (cherry picked from commit 2d216566f258badd07bc58de1e089b6e4175dc46) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef80220f32783cc4608754d1df5945bdb5b34209 --- libavutil/base64.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/base64.c b/libavutil/base64.c index 25ae8c411c..2c1c94fc37 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -120,10 +120,12 @@ int av_base64_decode(uint8_t *out, const char *in_str, int out_size) } out3: -*dst++ = v >> 10; +if (end - dst) +*dst++ = v >> 10; v <<= 2; out2: -*dst++ = v >> 4; +if (end - dst) +*dst++ = v >> 4; out1: out0: return bits & 1 ? AVERROR_INVALIDDATA : dst - out; ___ 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] libavutil/base64: Try not to write over the array end
ffmpeg | branch: release/5.1 | Michael Niedermayer | Sat May 11 03:13:17 2024 +0200| [f7fcdeb6a0e9a1aa0d3ed2eacc503404c8409cb8] | committer: Michael Niedermayer libavutil/base64: Try not to write over the array end Signed-off-by: Michael Niedermayer (cherry picked from commit 2d216566f258badd07bc58de1e089b6e4175dc46) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7fcdeb6a0e9a1aa0d3ed2eacc503404c8409cb8 --- libavutil/base64.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/base64.c b/libavutil/base64.c index 3e66f4fcbe..69e11e6f5e 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -127,10 +127,12 @@ validity_check: } out3: -*dst++ = v >> 10; +if (end - dst) +*dst++ = v >> 10; v <<= 2; out2: -*dst++ = v >> 4; +if (end - dst) +*dst++ = v >> 4; out1: out0: return bits & 1 ? AVERROR_INVALIDDATA : out ? dst - out : 0; ___ 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] libavutil/base64: Try not to write over the array end
ffmpeg | branch: release/6.1 | Michael Niedermayer | Sat May 11 03:13:17 2024 +0200| [f3931154bb43ce45564a00d03689b089de89073c] | committer: Michael Niedermayer libavutil/base64: Try not to write over the array end Signed-off-by: Michael Niedermayer (cherry picked from commit 2d216566f258badd07bc58de1e089b6e4175dc46) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3931154bb43ce45564a00d03689b089de89073c --- libavutil/base64.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/base64.c b/libavutil/base64.c index 3e66f4fcbe..69e11e6f5e 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -127,10 +127,12 @@ validity_check: } out3: -*dst++ = v >> 10; +if (end - dst) +*dst++ = v >> 10; v <<= 2; out2: -*dst++ = v >> 4; +if (end - dst) +*dst++ = v >> 4; out1: out0: return bits & 1 ? AVERROR_INVALIDDATA : out ? dst - out : 0; ___ 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] libavutil/base64: Try not to write over the array end
ffmpeg | branch: release/7.0 | Michael Niedermayer | Sat May 11 03:13:17 2024 +0200| [b9985f105ed5ca9dd049cff7ea9a31bdd2f8ccf0] | committer: Michael Niedermayer libavutil/base64: Try not to write over the array end Signed-off-by: Michael Niedermayer (cherry picked from commit 2d216566f258badd07bc58de1e089b6e4175dc46) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9985f105ed5ca9dd049cff7ea9a31bdd2f8ccf0 --- libavutil/base64.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/base64.c b/libavutil/base64.c index 3e66f4fcbe..69e11e6f5e 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -127,10 +127,12 @@ validity_check: } out3: -*dst++ = v >> 10; +if (end - dst) +*dst++ = v >> 10; v <<= 2; out2: -*dst++ = v >> 4; +if (end - dst) +*dst++ = v >> 4; out1: out0: return bits & 1 ? AVERROR_INVALIDDATA : out ? dst - out : 0; ___ 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] libavutil/base64: Try not to write over the array end
ffmpeg | branch: master | Michael Niedermayer | Sat May 11 03:13:17 2024 +0200| [2d216566f258badd07bc58de1e089b6e4175dc46] | committer: Michael Niedermayer libavutil/base64: Try not to write over the array end Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d216566f258badd07bc58de1e089b6e4175dc46 --- libavutil/base64.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/base64.c b/libavutil/base64.c index 3e66f4fcbe..69e11e6f5e 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -127,10 +127,12 @@ validity_check: } out3: -*dst++ = v >> 10; +if (end - dst) +*dst++ = v >> 10; v <<= 2; out2: -*dst++ = v >> 4; +if (end - dst) +*dst++ = v >> 4; out1: out0: return bits & 1 ? AVERROR_INVALIDDATA : out ? dst - out : 0; ___ 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".
