fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 08:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: fix reading intlist-like SSIDs (ie "101") (lp:874328)

Browse source 
Intlists have to end with a ';' since that's how they are written
out, and that's the only way we can actually distinguish between
intlist SSIDs and string SSIDs, really.
This commit is contained in:
Dan Williams 2011-10-14 11:20:22 -05:00
parent 65bcc4719a
commit 965d5860ab
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/settings/plugins/keyfile/reader.c
View file

@ -743,13 +743,13 @@ get_uchar_array (GKeyFile *keyfile,
int i; int i;
/* New format: just a string /* New format: just a string
* Old format: integer list; e.g. 11;25;38 * Old format: integer list; e.g. 11;25;38;
*/ */
tmp_string = g_key_file_get_string (keyfile, setting_name, key, NULL); tmp_string = g_key_file_get_string (keyfile, setting_name, key, NULL);
if (tmp_string) { if (tmp_string) {
GRegex *regex; GRegex *regex;
GMatchInfo *match_info; GMatchInfo *match_info;
const char *pattern = "^[[:space:]]*[[:digit:]]{1,3}[[:space:]]*(;[[:space:]]*[[:digit:]]{1,3}[[:space:]]*)*(;[[:space:]]*)?$"; const char *pattern = "^[[:space:]]*[[:digit:]]{1,3};[[:space:]]*([[:space:]]*[[:digit:]]{1,3};[[:space:]]*)*([[:space:]]*)?$";
regex = g_regex_new (pattern, 0, 0, NULL); regex = g_regex_new (pattern, 0, 0, NULL);
g_regex_match (regex, tmp_string, 0, &match_info); g_regex_match (regex, tmp_string, 0, &match_info);