diff options
| author | Srinivas Girigowda <sgirigow@qca.qualcomm.com> | 2014-08-28 15:25:32 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2014-08-28 15:25:32 (GMT) |
| commit | db9418bb1b8054b54d9b299e0334850d5e2b77ad (patch) | |
| tree | 4188744735f54436cccd36e1914ea3117236614e | |
| parent | d6df0d7e621904d46e197725aea83d129fa397ac (diff) | |
| download | hostap-db9418bb1b8054b54d9b299e0334850d5e2b77ad.zip hostap-db9418bb1b8054b54d9b299e0334850d5e2b77ad.tar.gz hostap-db9418bb1b8054b54d9b299e0334850d5e2b77ad.tar.bz2 | |
Add printf NULL checks to silence static analyzer
Add NULL checks to take care of issues reported by static analyzer tool
on potentially using NULL with printf format %s (which has undefined
behavior even though many compilers end up printing "(null)").
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
| -rw-r--r-- | hostapd/hostapd_cli.c | 2 | ||||
| -rw-r--r-- | hostapd/main.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c index 1c4a84c..09b7284 100644 --- a/hostapd/hostapd_cli.c +++ b/hostapd/hostapd_cli.c @@ -844,6 +844,8 @@ static int hostapd_cli_cmd_interface(struct wpa_ctrl *ctrl, int argc, hostapd_cli_close_connection(); os_free(ctrl_ifname); ctrl_ifname = os_strdup(argv[0]); + if (ctrl_ifname == NULL) + return -1; if (hostapd_cli_open_connection(ctrl_ifname)) { printf("Connected to interface '%s.\n", ctrl_ifname); diff --git a/hostapd/main.c b/hostapd/main.c index a9d7da5..a9d91b9 100644 --- a/hostapd/main.c +++ b/hostapd/main.c @@ -97,14 +97,15 @@ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module, else if (hapd && hapd->conf) os_snprintf(format, maxlen, "%s:%s%s %s", hapd->conf->iface, module_str ? " " : "", - module_str, txt); + module_str ? module_str : "", txt); else if (addr) os_snprintf(format, maxlen, "STA " MACSTR "%s%s: %s", MAC2STR(addr), module_str ? " " : "", - module_str, txt); + module_str ? module_str : "", txt); else os_snprintf(format, maxlen, "%s%s%s", - module_str, module_str ? ": " : "", txt); + module_str ? module_str : "", + module_str ? ": " : "", txt); if ((conf_stdout & module) && level >= conf_stdout_level) { wpa_debug_print_timestamp(); |