glib r7591 - branches/glib-2-18/gio

[alexl svn gnome org]

Author: alexl
Date: Fri Oct 10 11:36:41 2008
New Revision: 7591
URL: http://svn.gnome.org/viewvc/glib?rev=7591&view=rev

Log:
2008-10-10  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

	* gfileattribute.c (escape_byte_string):
	Upper half of byte is >> 4, not >> 8.
	Found by Kjartan Maraas via sparse



Modified:
   branches/glib-2-18/gio/ChangeLog
   branches/glib-2-18/gio/gfileattribute.c

Modified: branches/glib-2-18/gio/gfileattribute.c
==============================================================================
--- branches/glib-2-18/gio/gfileattribute.c	(original)
+++ branches/glib-2-18/gio/gfileattribute.c	Fri Oct 10 11:36:41 2008
@@ -366,7 +366,7 @@
 	    {
 	      *p++ = '\\';
 	      *p++ = 'x';
-	      *p++ = hex_digits[(c >> 8) & 0xf];
+	      *p++ = hex_digits[(c >> 4) & 0xf];
 	      *p++ = hex_digits[c & 0xf];
 	    }
 	}