mirror of
https://github.com/coreutils/coreutils.git
synced 2024-11-23 09:56:42 +08:00
maint: basenc: consistently check buffer bounds when encoding
* src/basenc.c (base16_encode, base2msbf_encode, base2lsbf_encode): Ensure we don't overflow the output buffer, whose length is passed in the OUTLEN parameter. This issue was flagged by clang with -Wunused-but-set-parameter.
This commit is contained in:
parent
bf73a7602a
commit
a46f34bb56
10
src/basenc.c
10
src/basenc.c
@ -630,12 +630,14 @@ base16_encode (char const *restrict in, idx_t inlen,
|
||||
{
|
||||
static const char base16[16] = "0123456789ABCDEF";
|
||||
|
||||
while (inlen--)
|
||||
while (inlen && outlen)
|
||||
{
|
||||
unsigned char c = *in;
|
||||
*out++ = base16[c >> 4];
|
||||
*out++ = base16[c & 0x0F];
|
||||
++in;
|
||||
inlen--;
|
||||
outlen -= 2;
|
||||
}
|
||||
}
|
||||
|
||||
@ -904,7 +906,7 @@ inline static void
|
||||
base2msbf_encode (char const *restrict in, idx_t inlen,
|
||||
char *restrict out, idx_t outlen)
|
||||
{
|
||||
while (inlen--)
|
||||
while (inlen && outlen)
|
||||
{
|
||||
unsigned char c = *in;
|
||||
for (int i = 0; i < 8; i++)
|
||||
@ -912,6 +914,7 @@ base2msbf_encode (char const *restrict in, idx_t inlen,
|
||||
*out++ = c & 0x80 ? '1' : '0';
|
||||
c <<= 1;
|
||||
}
|
||||
inlen--;
|
||||
outlen -= 8;
|
||||
++in;
|
||||
}
|
||||
@ -921,7 +924,7 @@ inline static void
|
||||
base2lsbf_encode (char const *restrict in, idx_t inlen,
|
||||
char *restrict out, idx_t outlen)
|
||||
{
|
||||
while (inlen--)
|
||||
while (inlen && outlen)
|
||||
{
|
||||
unsigned char c = *in;
|
||||
for (int i = 0; i < 8; i++)
|
||||
@ -929,6 +932,7 @@ base2lsbf_encode (char const *restrict in, idx_t inlen,
|
||||
*out++ = c & 0x01 ? '1' : '0';
|
||||
c >>= 1;
|
||||
}
|
||||
inlen--;
|
||||
outlen -= 8;
|
||||
++in;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user