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

ifcfg-rh: minor cleanup in svEscape()

Browse source
This commit is contained in:
Thomas Haller 2021-05-25 18:35:25 +02:00
parent 370316fc3e
commit 8db23d47e4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/settings/plugins/ifcfg-rh/shvar.c
View file

@ -242,7 +242,7 @@ _escape_ansic(const char *source)
/*****************************************************************************/ /*****************************************************************************/
#define _char_req_escape(ch) NM_IN_SET(ch, '"', '\\', '$', '`') #define _char_req_escape(ch) NM_IN_SET(ch, '"', '\\', '$', '`')
#define _char_req_escape_old(ch) NM_IN_SET(ch, '"', '\\', '\'', '$', '`', '~') #define _char_req_escape_old(ch) NM_IN_SET(ch, '"', '\\', '$', '`', '\'', '~')
#define _char_req_quotes(ch) NM_IN_SET(ch, ' ', '\'', '~', '\t', '|', '&', ';', '(', ')', '<', '>') #define _char_req_quotes(ch) NM_IN_SET(ch, ' ', '\'', '~', '\t', '|', '&', ';', '(', ')', '<', '>')
const char * const char *
@ -251,8 +251,10 @@ svEscape(const char *s, char **to_free)
char *new; char *new;
gsize mangle = 0; gsize mangle = 0;
gboolean requires_quotes = FALSE; gboolean requires_quotes = FALSE;
int newlen; gsize n_alloc;
size_t i, j, slen; gsize slen;
gsize i;
gsize j;
for (slen = 0; s[slen]; slen++) { for (slen = 0; s[slen]; slen++) {
if (_char_req_escape(s[slen])) if (_char_req_escape(s[slen]))
@ -272,8 +274,8 @@ svEscape(const char *s, char **to_free)
return s; return s;
} }
newlen = slen + mangle + 3; /* 3 is extra ""\0 */ n_alloc = slen + mangle + 3; /* 3 is extra ""\0 */
new = g_malloc(newlen); new = g_malloc(n_alloc);
j = 0; j = 0;
new[j++] = '"'; new[j++] = '"';
@ -285,7 +287,7 @@ svEscape(const char *s, char **to_free)
new[j++] = '"'; new[j++] = '"';
new[j++] = '\0'; new[j++] = '\0';
nm_assert(j == slen + mangle + 3); nm_assert(j == n_alloc);
*to_free = new; *to_free = new;
return new; return new;