Revert "tom_modem: fix pdu decoding issue #124"

This reverts commit 474a8f1.

Author: FUjr

application/tom_modem/src/extlib/pdu.c

@@ -404,13 +404,7 @@ int pdu_decode(const unsigned char* buffer, int buffer_length,
 		case 2:
 			{
 				// UCS2
-				if (output_sms_text_length < sms_text_size) {
-					memcpy(output_sms_text, buffer + sms_start + 1, output_sms_text_length);
-					output_sms_text[output_sms_text_length] = '\0';
-				} else {
-					memcpy(output_sms_text, buffer + sms_start + 1, sms_text_size - 1);
-					output_sms_text[sms_text_size - 1] = '\0';
-				}
+				memcpy(output_sms_text, buffer + sms_start + 1, output_sms_text_length);
 				break;
 			}
 		default:

application/tom_modem/src/operations.c

@@ -114,13 +114,11 @@ int sms_read(PROFILE_T *profile, void *transport_ptr)
                     dbg_msg("No PDU found for line: %s", line);
                     pdu = strtok(NULL, "\n");
                 }
-                sms->sms_pdu = (char *)malloc(strlen(pdu) + 1);
+                sms->sms_pdu = (char *)malloc(strlen(pdu));
                 sms->sender = (char *)malloc(PHONE_NUMBER_SIZE);
                 sms->sms_text = (char *)malloc(SMS_TEXT_SIZE);
                 sms->sms_index = get_sms_index(line);
                 memcpy(sms->sms_pdu, pdu, strlen(pdu));
-                sms->sms_pdu[strlen(pdu)] = '\0';
-                printf("sms->sms_pdu = %s", sms->sms_pdu);
                 int sms_len = decode_pdu(sms);
                 if (sms_len > 0)
                 {
@@ -236,12 +234,11 @@ int sms_read_unread(PROFILE_T *profile, void *transport_ptr)
                     dbg_msg("No PDU found for line: %s", line);
                     pdu = strtok(NULL, "\n");
                 }
-                sms->sms_pdu = (char *)malloc(strlen(pdu) + 1);
+                sms->sms_pdu = (char *)malloc(strlen(pdu));
                 sms->sender = (char *)malloc(PHONE_NUMBER_SIZE);
                 sms->sms_text = (char *)malloc(SMS_TEXT_SIZE);
                 sms->sms_index = get_sms_index(line);
                 memcpy(sms->sms_pdu, pdu, strlen(pdu));
-                sms->sms_pdu[strlen(pdu)] = '\0';
                 int sms_len = decode_pdu(sms);
                 if (sms_len > 0)
                 {

application/tom_modem/src/utils.c

@@ -117,8 +117,7 @@ int decode_pdu(SMS_T *sms)
             // UCS2
             sms->type = SMS_CHARSET_UCS2;
             int offset = 0;
-            int text_len = strlen(sms_text);
-            for (int i = skip_bytes; i < text_len - 1; i += 2)
+            for (int i = skip_bytes; i < SMS_TEXT_SIZE; i += 2)
             {
                 int ucs2_char = 0x000000FF & sms_text[i + 1];
                 ucs2_char |= (0x0000FF00 & (sms_text[i] << 8));
@@ -127,14 +126,16 @@ int decode_pdu(SMS_T *sms)
                 int j;
                 for (j = 0; j < len; j++)
                 {
-                    sms->sms_text[offset] = utf8_char[j];
+                    sprintf(sms->sms_text + offset, "%c", utf8_char[j]);
                     if (utf8_char[j] != '\0')
                     {
                         offset++;
                     }
+                    
                 }
             }
-            sms->sms_text[offset] = '\0';
+            offset++;
+            sprintf(sms->sms_text + offset, "%c", '\0');
             break;
         }
     default: