xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-23 11:39:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avutil/base64: Fix undefined NULL + 0

Browse Source 
Affected the base64 FATE test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit bbf8431b1bb947bdb3c9cb34718879ad1fc4e1be)
This commit is contained in:
Andreas Rheinhardt 2021-03-26 16:03:27 +01:00 committed by Andreas Rheinhardt
parent 6906a2b471
commit c7a95509b3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/base64.c
View File

@ -79,12 +79,16 @@ static const uint8_t map2[256] =
int av_base64_decode(uint8_t *out, const char *in_str, int out_size)
{
uint8_t *dst = out;
uint8_t *end = out + out_size;
uint8_t *end;
// no sign extension
const uint8_t *in = in_str;
unsigned bits = 0xff;
unsigned v;
if (!out)
goto validity_check;
end = out + out_size;
while (end - dst > 3) {
BASE64_DEC_STEP(0);
BASE64_DEC_STEP(1);
@ -108,6 +112,7 @@ int av_base64_decode(uint8_t *out, const char *in_str, int out_size)
*dst++ = v;
in += 4;
}
validity_check:
while (1) {
BASE64_DEC_STEP(0);
in++;
@ -126,7 +131,7 @@ out2:
*dst++ = v >> 4;
out1:
out0:
return bits & 1 ? AVERROR_INVALIDDATA : dst - out;
return bits & 1 ? AVERROR_INVALIDDATA : out ? dst - out : 0;
}
/*****************************************************************************