projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a10562
)
GDBusMessage: Properly check error and bail if set
author
David Zeuthen
<davidz@redhat.com>
Thu, 17 Jun 2010 20:02:24 +0000
(16:02 -0400)
committer
David Zeuthen
<davidz@redhat.com>
Thu, 17 Jun 2010 20:12:46 +0000
(16:12 -0400)
Otherwise we may set a GError on top of it.
Signed-off-by: David Zeuthen <davidz@redhat.com>
gio/gdbusmessage.c
patch
|
blob
|
history
diff --git
a/gio/gdbusmessage.c
b/gio/gdbusmessage.c
index
2c2a832
..
18833c8
100644
(file)
--- 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))
{