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

sms-part: check UDH length vs available size before trying to read it

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=698246
This commit is contained in:
Aleksander Morgado
2013-04-18 14:43:06 +02:00
parent 9fa5b9001a
commit 95274bfa23
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mm-sms-part.c
View File

@@ -779,6 +779,8 @@ mm_sms_part_new_from_binary_pdu (guint index,
udhl = pdu[tp_user_data_offset] + 1; udhl = pdu[tp_user_data_offset] + 1;
end = tp_user_data_offset + udhl; end = tp_user_data_offset + udhl;
PDU_SIZE_CHECK (tp_user_data_offset + udhl, "cannot read UDH");
for (offset = tp_user_data_offset + 1; (offset + 1) < end;) { for (offset = tp_user_data_offset + 1; (offset + 1) < end;) {
guint8 ie_id, ie_len; guint8 ie_id, ie_len;
@@ -853,7 +855,9 @@ mm_sms_part_new_from_binary_pdu (guint index,
{ {
GByteArray *raw; GByteArray *raw;
mm_dbg ("Skipping SMS text: Unknown encoding"); mm_dbg ("Skipping SMS text: Unknown encoding (0x%02X)", user_data_encoding);
PDU_SIZE_CHECK (tp_user_data_offset + tp_user_data_size_bytes, "cannot read user data");
/* 8-bit encoding is usually binary data, and we have no idea what /* 8-bit encoding is usually binary data, and we have no idea what
* actual encoding the data is in so we can't convert it. * actual encoding the data is in so we can't convert it.