From bef69cd7b3f386ee7a41af597aec8d54c5783637 Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Fri, 4 Jan 2008 12:40:03 +0000 Subject: [PATCH] Resolve 64 bit-shift bug in g_markup_collect_attributes. Spotted by Lieven van der Heide. * glib/gmarkup.c: Use G_GUINT64_CONSTANT in bit-shift. svn path=/trunk/; revision=6243 --- ChangeLog | 7 +++++++ glib/gmarkup.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 52ad263..720af98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-04 Mathias Hasselmann + + Resolve 64 bit-shift bug in g_markup_collect_attributes. + Spotted by Lieven van der Heide. + + * glib/gmarkup.c: Use G_GUINT64_CONSTANT in bit-shift. + 2008-01-02 Alvaro Lopez Ortega * gio/gunixmount.c (g_unix_mount_unmount, g_unix_mount_eject): diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 1467e17..e1e9aa5 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -2602,7 +2602,7 @@ g_markup_collect_attributes (const gchar *element_name, /* ensure we collected all the arguments */ for (i = 0; attribute_names[i]; i++) - if ((collected & (1 << i)) == 0) + if ((collected & (G_GUINT64_CONSTANT(1) << i)) == 0) { /* attribute not collected: could be caused by two things. * -- 2.7.4