DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Add checks to avoid calling strlen on a null pointer

Browse Source
This commit is contained in:
Jonathan Bennett
2016-05-08 00:41:45 -05:00
parent 7b11166260
commit b517fdad44
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/fw_util_firewalld.c
+2 -2
View File
@@ -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]);
server/fw_util_iptables.c
+2 -2
View File
@@ -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]);