kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 228620 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@228650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-11-06 20:37:09 +00:00
parent a40c49579c
commit 4413bd2360
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
funcs/func_base64.c
View File

@@ -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;
}

2
main/utils.c
View File

@@ -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;