fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 14:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

supplicant: use NMStrBuf in wifi_freqs_to_string()

Browse source 
And don't access global data without atomic operations.
This commit is contained in:
Thomas Haller 2020-06-21 22:04:59 +02:00
parent 652e0c843b
commit 3b4a4bef7b
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/supplicant/nm-supplicant-config.c
View file

@ -10,6 +10,7 @@
#include <stdlib.h>
#include "nm-glib-aux/nm-str-buf.h"
#include "nm-core-internal.h"
#include "nm-supplicant-settings-verify.h"
#include "nm-setting.h"
@ -341,26 +342,39 @@ wifi_freqs_to_string (gboolean bg_band)
{
static const char *str_2ghz = NULL;
static const char *str_5ghz = NULL;
const char *str;
const char **f_p;
const char *f;
str = bg_band ? str_2ghz : str_5ghz;
f_p = bg_band
? &str_2ghz
: &str_5ghz;
if (G_UNLIKELY (str == NULL)) {
GString *tmp;
again:
f = g_atomic_pointer_get (f_p);
if (G_UNLIKELY (!f)) {
nm_auto_str_buf NMStrBuf strbuf = NM_STR_BUF_INIT (400, FALSE);
const guint *freqs;
int i;
freqs = bg_band ? nm_utils_wifi_2ghz_freqs () : nm_utils_wifi_5ghz_freqs ();
tmp = g_string_sized_new (bg_band ? 70 : 225);
for (i = 0; freqs[i]; i++)
g_string_append_printf (tmp, i == 0 ? "%d" : " %d", freqs[i]);
str = g_string_free (tmp, FALSE);
if (bg_band)
str_2ghz = str;
else
str_5ghz = str;
freqs = bg_band
? nm_utils_wifi_2ghz_freqs ()
: nm_utils_wifi_5ghz_freqs ();
for (i = 0; freqs[i]; i++) {
if (i > 0)
nm_str_buf_append_c (&strbuf, ' ');
nm_str_buf_append_printf (&strbuf, "%u", freqs[i]);
}
f = g_strdup (nm_str_buf_get_str (&strbuf));
if (!g_atomic_pointer_compare_and_exchange (f_p, NULL, f)) {
g_free ((char *) f);
goto again;
}
}
return str;
return f;
}
gboolean