diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 20:42:05 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 20:42:05 +0000 |
| commit | 26d2b763945787b7d04485d50f65730202ea2f51 (patch) | |
| tree | 5d357e7663603ae0d6d3f189f84abb3923b8ae3e /funcs | |
| parent | 9601ec146fe6ca953aa26939e383ab5e5d24b1b2 (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.0@228651 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_base64.c | 9 |
1 files changed, 8 insertions, 1 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; } |