emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base32/64: "truncated base64 input" -> "truncated input"

Browse Source 
text	   data	    bss	    dec	    hex	filename
1021739	    559	   5052	1027350	  fad16	busybox_old
1021732	    559	   5052	1027343	  fad0f	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-11-28 13:39:05 +01:00
parent 885121e25d
commit ae04ce82cf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libbb/uuencode.c
View File

@ -28,7 +28,7 @@ const char bb_uuenc_tbl_base64[] ALIGN1 = {
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
'w', 'x', 'y', 'z', '0', '1', '2', '3', 'w', 'x', 'y', 'z', '0', '1', '2', '3',
'4', '5', '6', '7', '8', '9', '+', '/', '4', '5', '6', '7', '8', '9', '+', '/',
'=' /* termination character */, '=' /* termination character */
}; };
const char bb_uuenc_tbl_std[] ALIGN1 = { const char bb_uuenc_tbl_std[] ALIGN1 = {
'`', '!', '"', '#', '$', '%', '&', '\'', '`', '!', '"', '#', '$', '%', '&', '\'',
@ -38,7 +38,7 @@ const char bb_uuenc_tbl_std[] ALIGN1 = {
'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
'X', 'Y', 'Z', '[', '\\', ']', '^', '_', 'X', 'Y', 'Z', '[', '\\',']', '^', '_',
'`' /* termination character */ '`' /* termination character */
}; };
@ -82,9 +82,10 @@ void FAST_FUNC bb_uuencode(char *p, const void *src, int length, const char *tbl
/* /*
* Decode base64 encoded string. * Decode base64 encoded string.
* *
* Returns: pointer to the undecoded part of source. * Returns: pointer past the last written output byte,
* the result is not NUL-terminated.
* (*pp_src) is advanced past the last read byte.
* If points to '\0', then the source was fully decoded. * If points to '\0', then the source was fully decoded.
* (*pp_dst): advanced past the last written byte.
*/ */
char* FAST_FUNC decode_base64(char *dst, const char **pp_src) char* FAST_FUNC decode_base64(char *dst, const char **pp_src)
{ {
@ -131,7 +132,7 @@ char* FAST_FUNC decode_base64(char *dst, const char **pp_src)
} }
/* i is zero here if full 4-char block was decoded */ /* i is zero here if full 4-char block was decoded */
if (pp_src) if (pp_src)
*pp_src = src - i; /* -i rejects truncations: e.g. "MQ" and "MQ=" (correct encoding is "MQ==" -> "1") */ *pp_src = src - i; /* -i signals truncation: e.g. "MQ" and "MQ=" (correct encoding is "MQ==" -> "1") */
return dst; return dst;
} }
@ -265,7 +266,7 @@ void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags)
if (*in_tail == '\0') if (*in_tail == '\0')
return; return;
/* No */ /* No */
bb_simple_error_msg_and_die("truncated base64 input"); bb_simple_error_msg_and_die("truncated input");
} }
/* It was partial decode */ /* It was partial decode */