[svn-commits] mnicholson: branch 1.4 r228378 - in /branches/1.4: funcs/ main/

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Fri Nov  6 10:26:59 2009
New Revision: 228378

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228378
Log:
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

Modified:
    branches/1.4/funcs/func_base64.c
    branches/1.4/main/utils.c

Modified: branches/1.4/funcs/func_base64.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/funcs/func_base64.c?view=diff&rev=228378&r1=228377&r2=228378
==============================================================================
--- branches/1.4/funcs/func_base64.c (original)
+++ branches/1.4/funcs/func_base64.c Fri Nov  6 10:26:59 2009
@@ -53,12 +53,19 @@
 static int base64_decode(struct ast_channel *chan, 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;
 }

Modified: branches/1.4/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/utils.c?view=diff&rev=228378&r1=228377&r2=228378
==============================================================================
--- branches/1.4/main/utils.c (original)
+++ branches/1.4/main/utils.c Fri Nov  6 10:26:59 2009
@@ -269,7 +269,7 @@
 	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;