colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charsets: fix read of uninitialized memory in gsm unpacked conversion

Browse Source 
==1==WARNING: MemorySanitizer: use-of-uninitialized-value
    #0 0x59c6c88a31ef in gsm_ext_char_to_utf8 src/mm-charsets.c:256:13
    #1 0x59c6c88a31ef in charset_gsm_unpacked_to_utf8 src/mm-charsets.c:339:20
    #2 0x59c6c88a31ef in mm_modem_charset_bytearray_to_utf8 src/mm-charsets.c:857:30
    #3 0x59c6c889babd in sms_decode_address src/mm-sms-part-3gpp.c:143:16
    #4 0x59c6c8899d3a in mm_sms_part_3gpp_new_from_binary_pdu src/mm-sms-part-3gpp.c:514:15
This commit is contained in:
Aleksander Morgado
2023-05-18 20:54:49 +00:00
committed by Aleksander Morgado
parent a03da1f3cb
commit b70fd80c0f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mm-charsets.c
View File

@@ -310,7 +310,7 @@ charset_gsm_unpacked_to_utf8 (const guint8 *gsm,
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
guint8 uchars[4]; guint8 uchars[4];
guint8 ulen; guint8 ulen = 0;
/* /*
* 0x00 is NULL (when followed only by 0x00 up to the * 0x00 is NULL (when followed only by 0x00 up to the
@@ -336,9 +336,11 @@ charset_gsm_unpacked_to_utf8 (const guint8 *gsm,
if (gsm[i] == GSM_ESCAPE_CHAR) { if (gsm[i] == GSM_ESCAPE_CHAR) {
/* Extended alphabet, decode next char */ /* Extended alphabet, decode next char */
ulen = gsm_ext_char_to_utf8 (gsm[i+1], uchars); if (i + 1 < len) {
ulen = gsm_ext_char_to_utf8 (gsm[i + 1], uchars);
if (ulen) if (ulen)
i += 1; i += 1;
}
} else { } else {
/* Default alphabet */ /* Default alphabet */
ulen = gsm_def_char_to_utf8 (gsm[i], uchars); ulen = gsm_def_char_to_utf8 (gsm[i], uchars);