Index: apps/app_sms.c
===================================================================
--- apps/app_sms.c	(revision 403854)
+++ apps/app_sms.c	(revision 403855)
@@ -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;

Property changes on: .
___________________________________________________________________
Modified: branch-1.8-merged
   - /branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718,379825,379885,379963,380210,380254,380297,380347,380364,380451,380458,380520,380572,380611,380696,380853,380973,381216,381281,381364,381466,381668,381770,381847,381916,381939,381975,382021,382087,382107,382110,382171,382227,382233,382409,382513,382847,382939,382942,383061,383120,383124,383165,383340,383460,383667,383796,383835,383839,383863,384048,384118,384162,384325,384410,384544,384640,384685,385047,385170,385190,385402,385429,385551,385593,385633,385636,385683,385745,385916,386049,386109,386256,386483,386641,386672,386792,386877,386929,387036,387213,387294,387297,387312,387344,387421,387688,387875,388111,388376,388423,388425,388477,388529,388532,388596,388838,389244,389676,389895,390044,391062,391065,391107,391143,391215,391333,391489,391778,393627,393928,394106,394302,394640,394886,394896,394899,394940,394980,395032,396196,396240,396279,396427,396579,396582,396619,396656,396745,396958,396994,397033,397064,397106,397112,397156,397204,397256,397308,397377,397525,398018,398021,398060,398102,398167,398235,398301,398379,398416,398456,398523,398576,398648,398703,398748,398752,398757,398835,398880,398884,398977,399033,399098,399158,399304,399351,399402,399456,399697,399794,399818,399939,400013,400073,400089,400137,401959,402000,402150,402224,402287,402468,402604,402645,402708,403014,403449,403634
   + /branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718,379825,379885,379963,380210,380254,380297,380347,380364,380451,380458,380520,380572,380611,380696,380853,380973,381216,381281,381364,381466,381668,381770,381847,381916,381939,381975,382021,382087,382107,382110,382171,382227,382233,382409,382513,382847,382939,382942,383061,383120,383124,383165,383340,383460,383667,383796,383835,383839,383863,384048,384118,384162,384325,384410,384544,384640,384685,385047,385170,385190,385402,385429,385551,385593,385633,385636,385683,385745,385916,386049,386109,386256,386483,386641,386672,386792,386877,386929,387036,387213,387294,387297,387312,387344,387421,387688,387875,388111,388376,388423,388425,388477,388529,388532,388596,388838,389244,389676,389895,390044,391062,391065,391107,391143,391215,391333,391489,391778,393627,393928,394106,394302,394640,394886,394896,394899,394940,394980,395032,396196,396240,396279,396427,396579,396582,396619,396656,396745,396958,396994,397033,397064,397106,397112,397156,397204,397256,397308,397377,397525,398018,398021,398060,398102,398167,398235,398301,398379,398416,398456,398523,398576,398648,398703,398748,398752,398757,398835,398880,398884,398977,399033,399098,399158,399304,399351,399402,399456,399697,399794,399818,399939,400013,400073,400089,400137,401959,402000,402150,402224,402287,402468,402604,402645,402708,403014,403449,403634,403853