wok view glib/stuff/glib-CVE-2008-4316.diff @ rev 2979
opal-dev: fix path for libopal_s.a
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon May 11 02:14:35 2009 +0200 (2009-05-11) |
| parents | |
| children |
line source
1 --- glib/gbase64.c 2009/02/23 04:30:06 7897
2 +++ glib/gbase64.c 2009/03/12 13:30:55 7973
3 @@ -54,8 +54,9 @@
4 *
5 * The output buffer must be large enough to fit all the data that will
6 * be written to it. Due to the way base64 encodes you will need
7 - * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will
8 - * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes.
9 + * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of
10 + * non-zero state). If you enable line-breaking you will need at least:
11 + * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space.
12 *
13 * @break_lines is typically used when putting base64-encoded data in emails.
14 * It breaks the lines at 72 columns instead of putting all of the text on
15 @@ -233,8 +234,14 @@
16 g_return_val_if_fail (data != NULL, NULL);
17 g_return_val_if_fail (len > 0, NULL);
19 - /* We can use a smaller limit here, since we know the saved state is 0 */
20 - out = g_malloc (len * 4 / 3 + 4);
21 + /* We can use a smaller limit here, since we know the saved state is 0,
22 + +1 is needed for trailing \0, also check for unlikely integer overflow */
23 + if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3)
24 + g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)",
25 + G_STRLOC, len);
26 +
27 + out = g_malloc ((len / 3 + 1) * 4 + 1);
28 +
29 outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save);
30 outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save);
31 out[outlen] = '\0';
32 @@ -275,7 +282,8 @@
33 *
34 * The output buffer must be large enough to fit all the data that will
35 * be written to it. Since base64 encodes 3 bytes in 4 chars you need
36 - * at least: @len * 3 / 4 bytes.
37 + * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero
38 + * state).
39 *
40 * Return value: The number of bytes of output that was written
41 *
42 @@ -358,7 +366,8 @@
43 gsize *out_len)
44 {
45 guchar *ret;
46 - gint input_length, state = 0;
47 + gsize input_length;
48 + gint state = 0;
49 guint save = 0;
51 g_return_val_if_fail (text != NULL, NULL);
52 @@ -368,7 +377,9 @@
54 g_return_val_if_fail (input_length > 1, NULL);
56 - ret = g_malloc0 (input_length * 3 / 4);
57 + /* We can use a smaller limit here, since we know the saved state is 0,
58 + +1 used to avoid calling g_malloc0(0), and hence retruning NULL */
59 + ret = g_malloc0 ((input_length / 4) * 3 + 1);
61 *out_len = g_base64_decode_step (text, input_length, ret, &state, &save);