summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-10-01 21:42:36 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-10-01 21:42:36 +0000
commit352b72d2f24f6298afcf3b596bb6b327ac144d63 (patch)
treec33d1903133a50cfe2248472cc11eb52a734bfb4
parent2eb145c26f7e173d94e1d9506f80b34ec991e13f (diff)
downloadgtk+-352b72d2f24f6298afcf3b596bb6b327ac144d63.tar.gz
Patch from Andy Wingo to always escape ? to avoid accidentally generating
Tue Oct 1 17:35:43 2002 Owen Taylor <otaylor@redhat.com> * gdkpixdata.c: Patch from Andy Wingo to always escape ? to avoid accidentally generating trigraphs in the output (#94631)
-rw-r--r--gdk-pixbuf/ChangeLog6
-rw-r--r--gdk-pixbuf/gdk-pixdata.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f56c7b3294..1024a0d39c 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 1 17:35:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdkpixdata.c: Patch from Andy Wingo to always
+ escape ? to avoid accidentally generating trigraphs
+ in the output (#94631)
+
2002-09-28 Tor Lillqvist <tml@iki.fi>
* pixops/*.S: Don't use .type on Cygwin, either (#91597, Masahiro
diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c
index 1cbba1aa0c..4a5735f764 100644
--- a/gdk-pixbuf/gdk-pixdata.c
+++ b/gdk-pixbuf/gdk-pixdata.c
@@ -505,7 +505,7 @@ save_uchar (CSourceData *cdata,
cdata->pad = FALSE;
}
}
- if (d < 33 || d > 126)
+ if (d < 33 || d > 126 || d == '?')
{
APPEND (gstring, "\\%o", d);
cdata->pos += 1 + 1 + (d > 7) + (d > 63);