summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Leuenberger <dimstar@opensuse.org>2016-04-28 18:30:51 +0200
committerDominique Leuenberger <dimstar@opensuse.org>2016-04-28 18:30:51 +0200
commit59bc765d9cae2a1339bc1e270c21072f7b59c022 (patch)
tree6d873f37891bb27235c70fb89f42df4c65350646
parentb2b99e86f09d30c94c95913bff5f75e27a86697a (diff)
parentc6d886dad40c66cd4d363745ef240914f4dfc937 (diff)
downloadlibproxy-git-59bc765d9cae2a1339bc1e270c21072f7b59c022.tar.gz
Merge pull request #25 from mulander/fix-null-deref-in-ignore-ip
Fix #24 NULL pointer dereference in ignore_ip.cpp line 151
-rw-r--r--libproxy/modules/ignore_ip.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libproxy/modules/ignore_ip.cpp b/libproxy/modules/ignore_ip.cpp
index 709a08d..9f795c4 100644
--- a/libproxy/modules/ignore_ip.cpp
+++ b/libproxy/modules/ignore_ip.cpp
@@ -147,7 +147,7 @@ public:
else
{
/* If CIDR notation was used, get the netmask */
- if (sscanf(mask.c_str(), "%d", &cidr) == 1)
+ if (ign_ip && sscanf(mask.c_str(), "%d", &cidr) == 1)
net_ip = sockaddr_from_cidr(ign_ip->sa_family, cidr);
}