From 57dff1e06011347cc11492a36dc187cbcf5eece8 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Thu, 17 Jun 2010 16:02:24 -0400
Subject: [PATCH] GDBusMessage: Properly check error and bail if set

Otherwise we may set a GError on top of it.

Signed-off-by: David Zeuthen <davidz@redhat.com>
---
 gio/gdbusmessage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 2c2a832ca..18833c8da 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -970,6 +970,8 @@ parse_value_from_blob (GMemoryInputStream    *mis,
       if (!ensure_input_padding (mis, 4, &local_error))
         goto fail;
       array_len = g_data_input_stream_read_uint32 (dis, NULL, &local_error);
+      if (local_error != NULL)
+        goto fail;
 
       if (array_len > (2<<26))
         {