diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 20:37:09 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 20:37:09 +0000 |
| commit | 295e510176a3433a257858693e052ea96cc02a2e (patch) | |
| tree | a51a42a36dc4acace20ee54a7198dc8b0a3d5a9c | |
| parent | e6601ae23271f6ba68089de63baef589851c2307 (diff) | |
Merged revisions 228620 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r228620 | mnicholson | 2009-11-06 13:47:11 -0600 (Fri, 06 Nov 2009) | 15 lines
Merged revisions 228378 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r228378 | mnicholson | 2009-11-06 10:26:59 -0600 (Fri, 06 Nov 2009) | 8 lines
Properly handle '=' while decoding base64 messages and null terminate strings returned from BASE64_DECODE.
(closes issue #15271)
Reported by: chappell
Patches:
base64_fix.patch uploaded by chappell (license 8)
Tested by: kobaz
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@228650 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | funcs/func_base64.c | 9 | ||||
| -rw-r--r-- | main/utils.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/funcs/func_base64.c b/funcs/func_base64.c index 0849e9539..b44e695da 100644 --- a/funcs/func_base64.c +++ b/funcs/func_base64.c @@ -46,12 +46,19 @@ static int base64_encode(struct ast_channel *chan, const char *cmd, char *data, static int base64_decode(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { + int decoded_len; + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Syntax: BASE64_DECODE(<base_64 string>) - missing argument!\n"); return -1; } - ast_base64decode((unsigned char *) buf, data, len); + decoded_len = ast_base64decode((unsigned char *) buf, data, len); + if (decoded_len <= (len - 1)) { /* if not truncated, */ + buf[decoded_len] = '\0'; + } else { + buf[len - 1] = '\0'; + } return 0; } diff --git a/main/utils.c b/main/utils.c index f40031454..66873646e 100644 --- a/main/utils.c +++ b/main/utils.c @@ -267,7 +267,7 @@ int ast_base64decode(unsigned char *dst, const char *src, int max) unsigned int byte = 0; unsigned int bits = 0; int incnt = 0; - while (*src && (cnt < max)) { + while(*src && *src != '=' && (cnt < max)) { /* Shift in 6 bits of input */ byte <<= 6; byte |= (b2a[(int)(*src)]) & 0x3f; |