aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2012-02-07 13:59:32 -0600
committerDan Williams <dcbw@redhat.com>2012-02-07 14:02:40 -0600
commit08b0efe251f1b12e0632ff27f4e2b8ac42578983 (patch)
tree30692fdc074a9e56ae11d2f21311af7ddf5f63ab
parent1f0bc264022694819c68d22b87c2b40761d92af4 (diff)
gsm: ensure text mode SMS list doesn't pick up too much text
This likely has no effect, but just make sure the regex stops grabbing message content when it hits the CF/LF that terminates the message content in text mode.
-rw-r--r--src/mm-generic-gsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c
index 8240ecd7..86b5214c 100644
--- a/src/mm-generic-gsm.c
+++ b/src/mm-generic-gsm.c
@@ -5068,7 +5068,7 @@ text_parse_cmgl (MMGenericGsm *self, const char *response, GError **error)
priv = MM_GENERIC_GSM_GET_PRIVATE (self);
/* +CMGL: <index>,<stat>,<oa/da>,[alpha],<scts><CR><LF><data><CR><LF> */
- r = g_regex_new ("\\+CMGL:\\s*(\\d+)\\s*,\\s*([^,]*),\\s*([^,]*),\\s*([^,]*),\\s*([^\\r\\n]*)\\r\\n(.*)", 0, 0, NULL);
+ r = g_regex_new ("\\+CMGL:\\s*(\\d+)\\s*,\\s*([^,]*),\\s*([^,]*),\\s*([^,]*),\\s*([^\\r\\n]*)\\r\\n([^\\r\\n]*)", 0, 0, NULL);
g_assert (r);
if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, NULL)) {