1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
From 2d655ef8954695cabf9e99cc61411de2bb4cb847 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 28 Jan 2019 14:36:42 +0000
Subject: [PATCH] gdbusmessage: Fix check on upper limit of message size
There was a typo in the figure checked against. Add a unit test.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://gitlab.gnome.org/GNOME/glib/issues/1642
---
gio/gdbusmessage.c | 2 +-
gio/tests/gdbus-message.c | 72 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 169e6fd15..2ad51f888 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -1984,7 +1984,7 @@ g_dbus_message_bytes_needed (guchar *blob,
"Unable to determine message blob length - given blob is malformed");
}
- if (ret > (2<<27))
+ if (ret > (1<<27))
{
g_set_error (error,
G_IO_ERROR,
diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c
index 88a9c5d86..74e0f712e 100644
--- a/gio/tests/gdbus-message.c
+++ b/gio/tests/gdbus-message.c
@@ -141,6 +141,74 @@ message_copy (void)
/* ---------------------------------------------------------------------------------------------------- */
+/* Test g_dbus_message_bytes_needed() returns correct results for a variety of
+ * arbitrary binary inputs.*/
+static void
+message_bytes_needed (void)
+{
+ const struct
+ {
+ const guint8 blob[16];
+ gssize expected_bytes_needed;
+ }
+ vectors[] =
+ {
+ /* Little endian with header rounding */
+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */
+ 50, 0, 0, 0, /* body length */
+ 1, 0, 0, 0, /* message serial */
+ 7, 0, 0, 0 /* header length */}, 74 },
+ /* Little endian without header rounding */
+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */
+ 50, 0, 0, 0, /* body length */
+ 1, 0, 0, 0, /* message serial */
+ 8, 0, 0, 0 /* header length */}, 74 },
+ /* Big endian with header rounding */
+ { { 'B', 0, 0, 1, /* endianness, message type, flags, protocol version */
+ 0, 0, 0, 50, /* body length */
+ 0, 0, 0, 1, /* message serial */
+ 0, 0, 0, 7 /* header length */}, 74 },
+ /* Big endian without header rounding */
+ { { 'B', 0, 0, 1, /* endianness, message type, flags, protocol version */
+ 0, 0, 0, 50, /* body length */
+ 0, 0, 0, 1, /* message serial */
+ 0, 0, 0, 8 /* header length */}, 74 },
+ /* Invalid endianness */
+ { { '!', 0, 0, 1, /* endianness, message type, flags, protocol version */
+ 0, 0, 0, 50, /* body length */
+ 0, 0, 0, 1, /* message serial */
+ 0, 0, 0, 8 /* header length */}, -1 },
+ /* Oversized */
+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */
+ 0, 0, 0, 0x08, /* body length (128MiB) */
+ 1, 0, 0, 0, /* message serial */
+ 7, 0, 0, 0 /* header length */}, -1 },
+ };
+ gsize i;
+
+ for (i = 0; i < G_N_ELEMENTS (vectors); i++)
+ {
+ gssize bytes_needed;
+ GError *local_error = NULL;
+
+ g_test_message ("Vector: %" G_GSIZE_FORMAT, i);
+
+ bytes_needed = g_dbus_message_bytes_needed ((guchar *) vectors[i].blob,
+ G_N_ELEMENTS (vectors[i].blob),
+ &local_error);
+
+ if (vectors[i].expected_bytes_needed < 0)
+ g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
+ else
+ g_assert_no_error (local_error);
+ g_assert_cmpint (bytes_needed, ==, vectors[i].expected_bytes_needed);
+
+ g_clear_error (&local_error);
+ }
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
int
main (int argc,
char *argv[])
@@ -151,6 +219,8 @@ main (int argc,
g_test_add_func ("/gdbus/message/lock", message_lock);
g_test_add_func ("/gdbus/message/copy", message_copy);
- return g_test_run();
+ g_test_add_func ("/gdbus/message/bytes-needed", message_bytes_needed);
+
+ return g_test_run ();
}
--
2.20.1
|
GitWeb