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

libnm: use nm_ascii_is_regular() in _keyfile_key_encode()

Browse source 
No change in behavior.

(cherry picked from commit cf9e7ee5aa)
This commit is contained in:
Thomas Haller 2021-07-16 12:03:38 +02:00
parent e03587f9b0
commit 4e64d4af1e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
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/libnm-core-impl/nm-keyfile-utils.c
View file

@ -531,7 +531,7 @@ _keyfile_key_encode(const char *name, char **out_to_free)
if (ch == '\0') if (ch == '\0')
return name; return name;
if (ch < 0x20 || ch >= 127 || NM_IN_SET(ch, '=', '[', ']') if (!nm_ascii_is_regular(ch) || NM_IN_SET(ch, '=', '[', ']')
|| (ch == '\\' && g_ascii_isxdigit(name[i + 1]) && g_ascii_isxdigit(name[i + 2])) || (ch == '\\' && g_ascii_isxdigit(name[i + 1]) && g_ascii_isxdigit(name[i + 2]))
|| (ch == ' ' && name[i + 1] == '\0')) || (ch == ' ' && name[i + 1] == '\0'))
break; break;
@ -557,7 +557,7 @@ _keyfile_key_encode(const char *name, char **out_to_free)
if (ch == '\0') if (ch == '\0')
break; break;
if (ch < 0x20 || ch >= 127 || NM_IN_SET(ch, '=', '[', ']') if (!nm_ascii_is_regular(ch) || NM_IN_SET(ch, '=', '[', ']')
|| (ch == '\\' && g_ascii_isxdigit(name[i + 1]) && g_ascii_isxdigit(name[i + 2])) || (ch == '\\' && g_ascii_isxdigit(name[i + 1]) && g_ascii_isxdigit(name[i + 2]))
|| (ch == ' ' && name[i + 1] == '\0')) { || (ch == ' ' && name[i + 1] == '\0')) {
nm_str_buf_append_c(&str, '\\'); nm_str_buf_append_c(&str, '\\');