diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-02 12:48:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-04 10:15:40 +0200 |
| commit | ee3267b79c6517d97db60b23e1d87f0622a0ac8a (patch) | |
| tree | 02c642c6670b55b73fff3c9da64830a299326ab1 | |
| parent | e2ccb0f43d2f79361cc7b40bc539b8250824478b (diff) | |
| download | NetworkManager-th/strstrip.tar.gz | |
cli: use nm_strstrip_avoid_copy_a() to avoid heap allocationth/strstrip
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index d509b7a7e9..d47e1bd67e 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -305,7 +305,7 @@ _parse_ip_route (int family, nm_assert (str); nm_assert (!error || !*error); - str_clean = nm_strstrip_avoid_copy (str, &str_clean_free); + str_clean = nm_strstrip_avoid_copy_a (300, str, &str_clean_free); routev = nm_utils_strsplit_set (str_clean, " \t", FALSE); if (!routev) { g_set_error (error, 1, 0, @@ -479,7 +479,7 @@ _parse_team_link_watcher (const char *str, nm_assert (str); nm_assert (!error || !*error); - str_clean = nm_strstrip_avoid_copy (str, &str_clean_free); + str_clean = nm_strstrip_avoid_copy_a (300, str, &str_clean_free); watcherv = nm_utils_strsplit_set (str_clean, " \t", FALSE); if (!watcherv) { g_set_error (error, 1, 0, "'%s' is not valid", str); @@ -1275,7 +1275,7 @@ _set_fcn_gobject_int (ARGS_SET_FCN) gs_free char *vv_free = NULL; const char *vv; - vv = nm_strstrip_avoid_copy (value, &vv_free); + vv = nm_strstrip_avoid_copy_a (300, value, &vv_free); for (; value_infos->nick; value_infos++) { if (nm_streq (value_infos->nick, vv)) { v = value_infos->value; @@ -2169,7 +2169,7 @@ _set_fcn_gobject_bytes (ARGS_SET_FCN) if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) return _gobject_property_reset_default (setting, property_info->property_name); - val_strip = nm_strstrip_avoid_copy (value, &val_strip_free); + val_strip = nm_strstrip_avoid_copy_a (300, value, &val_strip_free); /* First try hex string in the format of AAbbCCDd */ bytes = nm_utils_hexstr2bin (val_strip); @@ -2253,7 +2253,7 @@ _set_fcn_cert_8021x (ARGS_SET_FCN) if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) return _gobject_property_reset_default (setting, property_info->property_name); - value = nm_strstrip_avoid_copy (value, &value_to_free); + value = nm_strstrip_avoid_copy_a (300, value, &value_to_free); if (strncmp (value, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; @@ -3330,7 +3330,7 @@ _set_fcn_ip_config_gateway (ARGS_SET_FCN) if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) return _gobject_property_reset_default (setting, property_info->property_name); - value = nm_strstrip_avoid_copy (value, &value_to_free); + value = nm_strstrip_avoid_copy_a (300, value, &value_to_free); if (!nm_utils_ipaddr_valid (addr_family, value)) { g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT, @@ -4209,7 +4209,7 @@ _set_fcn_ethtool (ARGS_SET_FCN) goto set; } - value = nm_strstrip_avoid_copy (value, &value_to_free); + value = nm_strstrip_avoid_copy_a (300, value, &value_to_free); if (NM_IN_STRSET (value, "1", "yes", "true", "on")) val = NM_TERNARY_TRUE; |