summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2004-09-15 19:25:37 +0000
committerTor Lillqvist <tml@src.gnome.org>2004-09-15 19:25:37 +0000
commit395402a366778cff95d51809859751f8a995ebff (patch)
tree5ba7a9fb3352fb42c098ce92f781a9c108b76a63
parent6479229c21d4824ca6e2a3de783248a2ea3a3938 (diff)
downloadpango-395402a366778cff95d51809859751f8a995ebff.tar.gz
Escape also backslashes. (#152607, Kazuki Iwamoto)
2004-09-15 Tor Lillqvist <tml@iki.fi> * pango/querymodules.c (string_needs_escape, escape_string): Escape also backslashes. (#152607, Kazuki Iwamoto)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/querymodules.c5
5 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a70810a2..6eff0f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
Mon Sep 13 17:38:58 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.6.0 ===
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index a70810a2..6eff0f05 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
Mon Sep 13 17:38:58 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.6.0 ===
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index a70810a2..6eff0f05 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
Mon Sep 13 17:38:58 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.6.0 ===
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index a70810a2..6eff0f05 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2004-09-15 Tor Lillqvist <tml@iki.fi>
+
+ * pango/querymodules.c (string_needs_escape, escape_string):
+ Escape also backslashes. (#152607, Kazuki Iwamoto)
+
Mon Sep 13 17:38:58 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.6.0 ===
diff --git a/pango/querymodules.c b/pango/querymodules.c
index 8ea48b7a..557ae7ac 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -52,7 +52,7 @@ string_needs_escape (const char *str)
if (!c)
return FALSE;
- else if (c == '\"' || g_ascii_isspace (c))
+ else if (c == '\"' || c == '\\' || g_ascii_isspace (c))
return TRUE;
}
}
@@ -76,6 +76,9 @@ escape_string (const char *str)
case '\"':
g_string_append (result, "\\\"");
break;
+ case '\\':
+ g_string_append (result, "\\\\");
+ break;
default:
g_string_append_c (result, c);
}