From b517fdad44d0818960c67912781d4dd15da6e7f5 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 8 May 2016 00:41:45 -0500 Subject: [PATCH] Add checks to avoid calling strlen on a null pointer --- server/fw_util_firewalld.c | 4 ++-- server/fw_util_iptables.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/fw_util_firewalld.c b/server/fw_util_firewalld.c index 18dcf2b2..85443734 100644 --- a/server/fw_util_firewalld.c +++ b/server/fw_util_firewalld.c @@ -1389,7 +1389,7 @@ static void snat_rule(const fko_srv_options_t * const opts, /* Add SNAT or MASQUERADE rules. */ - if(acc->force_snat && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) + if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) { /* Using static SNAT */ snat_chain = &(opts->fw_config->chain[FIREWD_SNAT_ACCESS]); @@ -1423,7 +1423,7 @@ static void snat_rule(const fko_srv_options_t * const opts, { /* Add SNAT or MASQUERADE rules. */ - if(acc->force_snat && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) + if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) { /* Using static SNAT */ snat_chain = &(opts->fw_config->chain[FIREWD_SNAT_ACCESS]); diff --git a/server/fw_util_iptables.c b/server/fw_util_iptables.c index e6966e90..96d0e512 100644 --- a/server/fw_util_iptables.c +++ b/server/fw_util_iptables.c @@ -1377,7 +1377,7 @@ static void snat_rule(const fko_srv_options_t * const opts, /* Add SNAT or MASQUERADE rules. */ - if(acc->force_snat && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) + if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) { /* Using static SNAT */ snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]); @@ -1411,7 +1411,7 @@ static void snat_rule(const fko_srv_options_t * const opts, { /* Add SNAT or MASQUERADE rules. */ - if(acc->force_snat && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) + if(acc->force_snat && acc->force_snat_ip != NULL && is_valid_ipv4_addr(acc->force_snat_ip, strlen(acc->force_snat_ip))) { /* Using static SNAT */ snat_chain = &(opts->fw_config->chain[IPT_SNAT_ACCESS]);