34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
From 79a5a4eed2189ea87d25cbe00bc824a2572cad66 Mon Sep 17 00:00:00 2001
|
|
From: Aleksander Morgado <aleksandermj@chromium.org>
|
|
Date: Thu, 1 Sep 2022 15:00:03 +0200
|
|
Subject: [PATCH] serial-parsers: fix invalid EXZ error parser
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Passed undetected when glib2 was using pcre1, it triggers an error now
|
|
with pcre2.
|
|
|
|
See https://gitlab.gnome.org/GNOME/glib/-/issues/2729#note_1542038
|
|
|
|
Reported and fix suggested by: Marco Trevisan (Trevi帽o) <mail@3v1n0.net>
|
|
---
|
|
src/mm-serial-parsers.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c
|
|
index 0b60d607d..fd01537d7 100644
|
|
--- a/src/mm-serial-parsers.c
|
|
+++ b/src/mm-serial-parsers.c
|
|
@@ -115,7 +115,7 @@ mm_serial_parser_v1_new (void)
|
|
parser->regex_cms_error = g_regex_new ("\\r\\n\\+CMS ERROR:\\s*(\\d+)\\r\\n$", flags, 0, NULL);
|
|
parser->regex_cme_error_str = g_regex_new ("\\r\\n\\+CME ERROR:\\s*([^\\n\\r]+)\\r\\n$", flags, 0, NULL);
|
|
parser->regex_cms_error_str = g_regex_new ("\\r\\n\\+CMS ERROR:\\s*([^\\n\\r]+)\\r\\n$", flags, 0, NULL);
|
|
- parser->regex_ezx_error = g_regex_new ("\\r\\n\\MODEM ERROR:\\s*(\\d+)\\r\\n$", flags, 0, NULL);
|
|
+ parser->regex_ezx_error = g_regex_new ("\\r\\nMODEM ERROR:\\s*(\\d+)\\r\\n$", flags, 0, NULL);
|
|
parser->regex_unknown_error = g_regex_new ("\\r\\n(ERROR)|(COMMAND NOT SUPPORT)\\r\\n$", flags, 0, NULL);
|
|
parser->regex_connect_failed = g_regex_new ("\\r\\n(NO CARRIER)|(BUSY)|(NO ANSWER)|(NO DIALTONE)\\r\\n$", flags, 0, NULL);
|
|
/* Samsung Z810 may reply "NA" to report a not-available error */
|
|
--
|
|
GitLab
|