colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: avoid intermediate GByteArray in path_to_scheme_value()

Browse Source 
It's not that to directly initialize the GBytes without an
intermediate GByteArray.
This commit is contained in:
Thomas Haller
2018-08-30 15:40:05 +02:00
parent 2be0bb8287
commit b0c3af6c84
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libnm-core/nm-setting-8021x.c
View File

@@ -664,20 +664,19 @@ nm_setting_802_1x_get_ca_cert_uri (NMSetting8021x *setting)
static GBytes *
path_to_scheme_value (const char *path)
{
GByteArray *array;
gsize len;
guint8 *mem;
gsize len, total_len;
g_return_val_if_fail (path != NULL && path[0], NULL);
len = strlen (path);
total_len = (NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH) + 1) + len;
/* Add the path scheme tag to the front, then the filename */
array = g_byte_array_sized_new (len + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH) + 1);
g_byte_array_append (array, (const guint8 *) NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH));
g_byte_array_append (array, (const guint8 *) path, len);
g_byte_array_append (array, (const guint8 *) "\0", 1);
return g_byte_array_free_to_bytes (array);
mem = g_new (guint8, total_len);
memcpy (mem, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH));
memcpy (&mem[NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)], path, len + 1);
return g_bytes_new_take (mem, total_len);
}
/**