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/trunk@228620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-11-06 19:47:11 +00:00
parent c17525391b
commit f44f8650cb
2 changed files with 16 additions and 3 deletions

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;