escape \' and \" in strings passed as filtering strings; bug reported by Alex Evseev...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 63813a6273ddaca3ee367fa836e1377ce944575c..10f1931fcaf7ceb79453f287fcb5d5792d4f9c33 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-04-07 [alfons]    0.7.4claws69
+
+       * src/matcher.[ch]
+       * src/prefs_filtering.c
+       * src/summaryview.c
+               escape \' and \" in strings passed as filtering strings; bug report by Alex Evseev.
+               (see http://www.geocrawler.com/lists/3/SourceForge/11619/25/8279435/)
+

 2002-04-07 [paul]      0.7.4claws68
 
        * sync with 0.7.4cvs32
 2002-04-07 [paul]      0.7.4claws68
 
        * sync with 0.7.4cvs32

diff --git a/configure.in b/configure.in
index abcb556e4eefa3e5e8b8ffbb4f2cb9591448e6fa..637902f94c1b8ecc6190e5886c1be8b3cb1c7a29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws68
+EXTRA_VERSION=claws69

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/matcher.c b/src/matcher.c
index 245c659f8b2ec17410e435413480df969bed8086..3c88091ebce1a5c8e953333c6ad1047150170978 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -109,6 +109,35 @@ gchar * get_matchparser_tab_str(gint id)
        return NULL;
 }
 
        return NULL;
 }
 

+/* matcher_escape_str() - escapes a string returns newly allocated escaped string */
+gchar *matcher_escape_str(const gchar *str)
+{
+       register const gchar *walk;
+       register int escape;
+       gchar *res;
+       register char *reswalk;
+
+       if (str == NULL)
+               return NULL;
+
+       for (escape = 0, walk = str; *walk; walk++)
+               if (*walk == '\'' || *walk == '\"')
+                       escape++;
+
+       if (!escape)
+               return g_strdup(str);
+       
+       reswalk = res = g_new0(gchar, (walk - str) + escape + 1);
+       for (walk = str; *walk; walk++, reswalk++) {
+               if (*walk == '\'' || *walk == '\"')
+                       *reswalk++ = '\\';
+               *reswalk = *walk;
+       }
+
+       *reswalk = 0;
+       return res;
+}
+

 /* matcher_unescape_str() - assumes that unescaping frees up room
  * in the string, so it returns the unescaped string in the 
  * source */
 /* matcher_unescape_str() - assumes that unescaping frees up room
  * in the string, so it returns the unescaped string in the 
  * source */

diff --git a/src/matcher.h b/src/matcher.h
index f0ac49f8e0769563af742891f5e8c2a8c2c3fced..e5a3662bca8d2ec8915183fd7c879af1292b4efa 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -103,6 +103,7 @@ gint matcher_parse_number(gchar ** str);
 gboolean matcher_parse_boolean_op(gchar ** str);
 gchar * matcher_parse_regexp(gchar ** str);
 gchar * matcher_parse_str(gchar ** str);
 gboolean matcher_parse_boolean_op(gchar ** str);
 gchar * matcher_parse_regexp(gchar ** str);
 gchar * matcher_parse_str(gchar ** str);

+gchar * matcher_escape_str(const gchar *str);

 gchar * matcher_unescape_str(gchar *str);
 gchar * matcherprop_to_string(MatcherProp * matcher);
 gchar * matcherlist_to_string(MatcherList * matchers);
 gchar * matcher_unescape_str(gchar *str);
 gchar * matcherprop_to_string(MatcherProp * matcher);
 gchar * matcherlist_to_string(MatcherList * matchers);

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index cce549af1ad1055fede00656fb39d9c87bd62164..6cbbaf14019e7d43e894a84d07d181f1c09db8e6 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -51,6 +51,7 @@
 #include "colorlabel.h"
 
 #include "matcher_parser.h"
 #include "colorlabel.h"
 
 #include "matcher_parser.h"

+#include "matcher.h"

 
 static struct Filtering {
        GtkWidget *window;
 
 static struct Filtering {
        GtkWidget *window;


@@ -238,6 +239,8 @@ void prefs_filtering_open(FolderItem * item,
                          const gchar *header,
                          const gchar *key)
 {
                          const gchar *header,
                          const gchar *key)
 {

+       gchar *esckey;
+

        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
 
        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
 


@@ -252,7 +255,9 @@ void prefs_filtering_open(FolderItem * item,
 
        cur_item = item;
 
 
        cur_item = item;
 

-       prefs_filtering_set_dialog(header, key);
+       esckey = matcher_escape_str(key);
+       prefs_filtering_set_dialog(header, esckey);
+       g_free(esckey);

 
        gtk_widget_show(filtering.window);
 
 
        gtk_widget_show(filtering.window);
 

diff --git a/src/summaryview.c b/src/summaryview.c
index b42cdfa6a045b2aa84705229641b7e71625f6b37..fff0c19e4ec2a4d4b6e706d959a2f70b13c62a8b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4075,6 +4075,12 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
                break;
        }
 
                break;
        }
 

+       /*
+        * NOTE: key may be allocated on the stack, so 
+        * prefs_filter[ing]_open() should have completed 
+        * and have set entries. Otherwise we're hosed.  
+        */
+

        if (global_processing)
                prefs_filtering_open(NULL, header, key);
        else
        if (global_processing)
                prefs_filtering_open(NULL, header, key);
        else