From 93fcaf93ce92aa8b335705e66c993dc6f9e628b0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 30 May 2013 23:51:05 -0500 Subject: modem-helpers: handle commas within +COPS response items (bgo #701329) Modems can probably put whatever they want between the quotes for the operator name, including commas. Handle that. https://bugzilla.gnome.org/show_bug.cgi?id=701329 --- src/mm-modem-helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mm-modem-helpers.c') diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 44a00a53..4bffd11b 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -530,7 +530,7 @@ mm_3gpp_parse_cops_test_response (const gchar *reply, * +COPS: (2,"","T-Mobile","31026",0),(1,"AT&T","AT&T","310410"),0) */ - r = g_regex_new ("\\((\\d),([^,\\)]*),([^,\\)]*),([^,\\)]*)[\\)]?,(\\d)\\)", G_REGEX_UNGREEDY, 0, &inner_error); + r = g_regex_new ("\\((\\d),\"([^\"\\)]*)\",([^,\\)]*),([^,\\)]*)[\\)]?,(\\d)\\)", G_REGEX_UNGREEDY, 0, &inner_error); if (inner_error) { mm_err ("Invalid regular expression: %s", inner_error->message); g_error_free (inner_error); -- cgit v1.2.3-70-g09d2