jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix VERSION_STR printf() calls in case the postfix strings include %

Browse source 
Do not use VERSION_STR directly as the format string to printf() since
it is possible for that string to contain '%'.

Signed-off-by: Didier Raboud <odyx@debian.org>
This commit is contained in:
Didier Raboud 2020-02-16 16:14:54 +01:00 committed by Jouni Malinen
parent dd74ddd0df
commit 8155b36fae
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hostapd/main.c
View file

@ -450,11 +450,12 @@ static int hostapd_global_run(struct hapd_interfaces *ifaces, int daemonize,
static void show_version(void) static void show_version(void)
{ {
fprintf(stderr, fprintf(stderr,
"hostapd v" VERSION_STR "\n" "hostapd v%s\n"
"User space daemon for IEEE 802.11 AP management,\n" "User space daemon for IEEE 802.11 AP management,\n"
"IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n" "IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
"Copyright (c) 2002-2019, Jouni Malinen <j@w1.fi> " "Copyright (c) 2002-2019, Jouni Malinen <j@w1.fi> "
"and contributors\n"); "and contributors\n",
VERSION_STR);
} }

2
hs20/server/hs20_spp_server.c
View file

@ -176,7 +176,7 @@ int main(int argc, char *argv[])
ctx.root_dir = optarg; ctx.root_dir = optarg;
break; break;
case 'v': case 'v':
printf("hs20_spp_server v" VERSION_STR "\n"); printf("hs20_spp_server v%s\n", VERSION_STR);
return 0; return 0;
default: default:
usage(); usage();

2
wpa_supplicant/eapol_test.c
View file

@ -1390,7 +1390,7 @@ int main(int argc, char *argv[])
eapol_test.ctrl_iface = 1; eapol_test.ctrl_iface = 1;
break; break;
case 'v': case 'v':
printf("eapol_test v" VERSION_STR "\n"); printf("eapol_test v%s\n", VERSION_STR);
return 0; return 0;
case 'W': case 'W':
wait_for_monitor++; wait_for_monitor++;

5
wpa_supplicant/wpa_priv.c
View file

@ -1189,14 +1189,15 @@ static void wpa_priv_fd_workaround(void)
static void usage(void) static void usage(void)
{ {
printf("wpa_priv v" VERSION_STR "\n" printf("wpa_priv v%s\n"
"Copyright (c) 2007-2017, Jouni Malinen <j@w1.fi> and " "Copyright (c) 2007-2017, Jouni Malinen <j@w1.fi> and "
"contributors\n" "contributors\n"
"\n" "\n"
"usage:\n" "usage:\n"
" wpa_priv [-Bdd] [-c<ctrl dir>] [-P<pid file>] " " wpa_priv [-Bdd] [-c<ctrl dir>] [-P<pid file>] "
"<driver:ifname> \\\n" "<driver:ifname> \\\n"
" [driver:ifname ...]\n"); " [driver:ifname ...]\n",
VERSION_STR);
} }

2
wpa_supplicant/wpa_supplicant.c
View file

@ -6817,7 +6817,7 @@ struct wpa_global * wpa_supplicant_init(struct wpa_params *params)
wpa_debug_timestamp = global->params.wpa_debug_timestamp = wpa_debug_timestamp = global->params.wpa_debug_timestamp =
params->wpa_debug_timestamp; params->wpa_debug_timestamp;
wpa_printf(MSG_DEBUG, "wpa_supplicant v" VERSION_STR); wpa_printf(MSG_DEBUG, "wpa_supplicant v%s", VERSION_STR);
if (eloop_init()) { if (eloop_init()) {
wpa_printf(MSG_ERROR, "Failed to initialize event loop"); wpa_printf(MSG_ERROR, "Failed to initialize event loop");