Message ID | 20240511012254.1612731-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 2d216566f258badd07bc58de1e089b6e4175dc46 |
Headers | show |
Series | [FFmpeg-devel,1/2] libavutil/base64: Try not to write over the array end | expand |
On Sat, May 11, 2024 at 03:22:53AM +0200, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavutil/base64.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) will apply patchset [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The bravest are surely those who have the clearest vision of what is before them, glory and danger alike, and yet notwithstanding go out to meet it. -- Thucydides
diff --git a/libavutil/base64.c b/libavutil/base64.c index 3e66f4fcbe5..69e11e6f5e1 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;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavutil/base64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)