58e4549
From 420a511e0aa787168c9eb2434c34bc2e405a0d8b Mon Sep 17 00:00:00 2001
58e4549
From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de>
58e4549
Date: Sun, 28 Jun 2015 23:06:45 +0200
58e4549
Subject: [PATCH] Fix GVariant tests on big endian machines
58e4549
58e4549
---
58e4549
 GVariant.xs | 10 +++++++---
58e4549
 1 file changed, 7 insertions(+), 3 deletions(-)
58e4549
58e4549
diff --git a/GVariant.xs b/GVariant.xs
58e4549
index e359829..7fddee8 100644
58e4549
--- a/GVariant.xs
58e4549
+++ b/GVariant.xs
58e4549
@@ -279,10 +279,14 @@ gboolean g_variant_is_container (GVariant *value);
58e4549
 
58e4549
 const char * g_variant_classify (GVariant *value);
58e4549
     PREINIT:
58e4549
-	GVariantClass vclass;
58e4549
+	char vclass_char[2];
58e4549
     CODE:
58e4549
-	vclass = g_variant_classify (value);
58e4549
-	RETVAL = (const char *) &vclass;
58e4549
+	/* g_variant_classify's return value is of type GVariantClass, which is
58e4549
+	 * probably wider than a char, so we must not treat its address as a
58e4549
+	 * string on big-endian machines. */
58e4549
+	vclass_char[0] = g_variant_classify (value);
58e4549
+	vclass_char[1] = 0;
58e4549
+	RETVAL = vclass_char;
58e4549
     OUTPUT:
58e4549
 	RETVAL
58e4549
 
58e4549
-- 
58e4549
2.1.0
58e4549