[asterisk-commits] sgriepentrog: branch certified-11.6 r403860 - /certified/branches/11.6/apps/

[SVN commits to the Asterisk project]

Author: sgriepentrog
Date: Mon Dec 16 09:38:48 2013
New Revision: 403860

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403860
Log:
app_sms: BufferOverflow when receiving odd length 16 bit message

This patch prevents an infinite loop overwriting memory when
a message is received into the unpacksms16() function, where
the length of the message is an odd number of bytes.

(closes issue ASTERISK-22590)
Reported by: Jan Juergens
Tested by: Jan Juergens

Modified:
    certified/branches/11.6/apps/app_sms.c

Modified: certified/branches/11.6/apps/app_sms.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/11.6/apps/app_sms.c?view=diff&rev=403860&r1=403859&r2=403860
==============================================================================
--- certified/branches/11.6/apps/app_sms.c (original)
+++ certified/branches/11.6/apps/app_sms.c Mon Dec 16 09:38:48 2013
@@ -696,7 +696,7 @@
 	}
 	while (l--) {
 		int v = *i++;
-		if (l--) {
+		if (l && l--) {
 			v = (v << 8) + *i++;
 		}
 		*o++ = v;
@@ -714,6 +714,7 @@
 	} else if (is8bit(dcs)) {
 		unpacksms8(i, l, udh, udhl, ud, udl, udhi);
 	} else {
+		l += l % 2;
 		unpacksms16(i, l, udh, udhl, ud, udl, udhi);
 	}
 	return l + 1;