From: oes <oes@users.sourceforge.net>
Date: Thu, 20 Nov 2003 11:39:24 +0000 (+0000)
Subject: Bugfix: The "?" wildcard for domain names had never been implemented. Ooops\!
X-Git-Tag: v_3_0_3~67
X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=351ff723acd6d1d9f7adf7190c372e325e3a74a9;p=privoxy.git

Bugfix: The "?" wildcard for domain names had never been implemented. Ooops\!
---

diff --git a/miscutil.c b/miscutil.c
index fb8d4f0c..46024816 100644
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.37.2.1 2002/09/25 12:58:51 oes Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.37.2.2 2002/11/12 14:28:18 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/Attic/miscutil.c,v $
@@ -36,6 +36,9 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.37.2.1 2002/09/25 12:58:51 oes
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    Revision 1.37.2.2  2002/11/12 14:28:18  oes
+ *    Proper backtracking in simplematch; fixes bug #632888
+ *
  *    Revision 1.37.2.1  2002/09/25 12:58:51  oes
  *    Made strcmpic and strncmpic safe against NULL arguments
  *    (which are now treated as empty strings).
@@ -819,8 +822,9 @@ int simplematch(char *pattern, char *text)
       /* 
        * Char match, or char range match? 
        */
-      if ((*pat == *txt)  
-      || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) )
+      if ( (*pat == *txt)
+      ||   (*pat == '?')
+      ||   ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) )
       {
          /* 
           * Sucess: Go ahead