From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 29 Feb 2012 19:34:04 +0000 (+0000)
Subject: Turn family mismatches in match_sockaddr() into fatal errors
X-Git-Tag: v_3_0_20~415
X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=commitdiff_plain;h=319b9c0b6a9badebc1883e85c08a6d9ae34e8c5a;p=privoxy.git

Turn family mismatches in match_sockaddr() into fatal errors
---

diff --git a/filters.c b/filters.c
index 5ca6b996..817aa921 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.163 2011/12/26 17:03:08 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.164 2011/12/31 14:47:44 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -185,10 +185,8 @@ static int match_sockaddr(const struct sockaddr_storage *network,
    if (network->ss_family != netmask->ss_family)
    {
       /* This should never happen */
-      log_error(LOG_LEVEL_ERROR,
-         "Internal error at %s:%llu: network and netmask differ in family",
-         __FILE__, __LINE__);
-      return 0;
+      assert(network->ss_family == netmask->ss_family);
+      log_error(LOG_LEVEL_FATAL, "Network and netmask differ in family.");
    }
 
    sockaddr_storage_to_ip(network, &network_addr, &addr_len, &network_port);