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
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
|
From 46bcd82800e37b0f5aead76184430ef2fe802748 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Sun, 6 Nov 2016 21:34:43 +0100
Subject: Bug 773233 - CVE-2007-3126 - Gimp 2.3.14 allows context-dependent
attackers...
...to cause a denial of service (crash) via an ICO file with an
InfoHeader containing a Height of zero
Add some error handling to ico-load.c and bail out on zero width or height
icons. Also some formatting cleanup.
---
plug-ins/file-ico/ico-load.c | 103 ++++++++++++++++++++++++++-----------------
1 file changed, 62 insertions(+), 41 deletions(-)
diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
index c8091d3..8cce94f 100644
--- a/plug-ins/file-ico/ico-load.c
+++ b/plug-ins/file-ico/ico-load.c
@@ -124,15 +124,17 @@ static guint32
ico_read_init (FILE *fp)
{
IcoFileHeader header;
+
/* read and check file header */
- if (!ico_read_int16 (fp, &header.reserved, 1)
- || !ico_read_int16 (fp, &header.resource_type, 1)
- || !ico_read_int16 (fp, &header.icon_count, 1)
- || header.reserved != 0
- || header.resource_type != 1)
+ if (! ico_read_int16 (fp, &header.reserved, 1) ||
+ ! ico_read_int16 (fp, &header.resource_type, 1) ||
+ ! ico_read_int16 (fp, &header.icon_count, 1) ||
+ header.reserved != 0 ||
+ header.resource_type != 1)
{
return 0;
}
+
return header.icon_count;
}
@@ -148,22 +150,25 @@ ico_read_size (FILE *fp,
gint32 color_type;
guint32 magic;
- if ( fseek (fp, info->offset, SEEK_SET) < 0 )
+ if (fseek (fp, info->offset, SEEK_SET) < 0)
return FALSE;
ico_read_int32 (fp, &magic, 1);
+
if (magic == ICO_PNG_MAGIC)
{
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL,
NULL);
- if (! png_ptr )
+ if (! png_ptr)
return FALSE;
+
info_ptr = png_create_info_struct (png_ptr);
- if (! info_ptr )
+ if (! info_ptr)
{
png_destroy_read_struct (&png_ptr, NULL, NULL);
return FALSE;
}
+
if (setjmp (png_jmpbuf (png_ptr)))
{
png_destroy_read_struct (&png_ptr, NULL, NULL);
@@ -182,8 +187,8 @@ ico_read_size (FILE *fp,
}
else if (magic == 40)
{
- if (ico_read_int32 (fp, &info->width, 1)
- && ico_read_int32 (fp, &info->height, 1))
+ if (ico_read_int32 (fp, &info->width, 1) &&
+ ico_read_int32 (fp, &info->height, 1))
{
info->height /= 2;
D(("ico_read_size: ICO: %ix%i\n", info->width, info->height));
@@ -200,8 +205,9 @@ ico_read_size (FILE *fp,
}
static IcoLoadInfo*
-ico_read_info (FILE *fp,
- gint icon_count)
+ico_read_info (FILE *fp,
+ gint icon_count,
+ GError **error)
{
gint i;
IcoFileEntry *entries;
@@ -209,8 +215,11 @@ ico_read_info (FILE *fp,
/* read icon entries */
entries = g_new (IcoFileEntry, icon_count);
- if ( fread (entries, sizeof(IcoFileEntry), icon_count, fp) <= 0 )
+ if (fread (entries, sizeof (IcoFileEntry), icon_count, fp) <= 0)
{
+ g_set_error (error, G_FILE_ERROR, 0,
+ _("Could not read '%lu' bytes"),
+ sizeof (IcoFileEntry));
g_free (entries);
return NULL;
}
@@ -218,23 +227,33 @@ ico_read_info (FILE *fp,
info = g_new (IcoLoadInfo, icon_count);
for (i = 0; i < icon_count; i++)
{
- info[i].width = entries[i].width;
+ info[i].width = entries[i].width;
info[i].height = entries[i].height;
- info[i].bpp = GUINT16_FROM_LE (entries[i].bpp);
- info[i].size = GUINT32_FROM_LE (entries[i].size);
+ info[i].bpp = GUINT16_FROM_LE (entries[i].bpp);
+ info[i].size = GUINT32_FROM_LE (entries[i].size);
info[i].offset = GUINT32_FROM_LE (entries[i].offset);
if (info[i].width == 0 || info[i].height == 0)
{
- ico_read_size (fp, info+i);
+ ico_read_size (fp, info + i);
}
D(("ico_read_info: %ix%i (%i bits, size: %i, offset: %i)\n",
info[i].width, info[i].height, info[i].bpp,
info[i].size, info[i].offset));
+
+ if (info[i].width == 0 || info[i].height == 0)
+ {
+ g_set_error (error, G_FILE_ERROR, 0,
+ _("Icon #%d has zero width or height"), i);
+ g_free (info);
+ g_free (entries);
+ return NULL;
+ }
}
g_free (entries);
+
return info;
}
@@ -256,10 +275,10 @@ ico_read_png (FILE *fp,
gint i;
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (! png_ptr )
+ if (! png_ptr)
return FALSE;
info = png_create_info_struct (png_ptr);
- if (! info )
+ if (! info)
{
png_destroy_read_struct (&png_ptr, NULL, NULL);
return FALSE;
@@ -287,14 +306,14 @@ ico_read_png (FILE *fp,
{
case PNG_COLOR_TYPE_GRAY:
png_set_expand_gray_1_2_4_to_8 (png_ptr);
- if ( bit_depth == 16 )
+ if (bit_depth == 16)
png_set_strip_16 (png_ptr);
png_set_gray_to_rgb (png_ptr);
png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
break;
case PNG_COLOR_TYPE_GRAY_ALPHA:
png_set_expand_gray_1_2_4_to_8 (png_ptr);
- if ( bit_depth == 16 )
+ if (bit_depth == 16)
png_set_strip_16 (png_ptr);
png_set_gray_to_rgb (png_ptr);
break;
@@ -427,16 +446,18 @@ ico_read_icon (FILE *fp,
data.planes, data.image_size, data.bpp,
data.used_clrs, data.important_clrs));
- if (data.planes != 1
- || data.compression != 0)
+ if (data.planes != 1 ||
+ data.compression != 0)
{
D(("skipping image: invalid header\n"));
return FALSE;
}
- if (data.bpp != 1 && data.bpp != 4
- && data.bpp != 8 && data.bpp != 24
- && data.bpp != 32)
+ if (data.bpp != 1 &&
+ data.bpp != 4 &&
+ data.bpp != 8 &&
+ data.bpp != 24 &&
+ data.bpp != 32)
{
D(("skipping image: invalid depth: %i\n", data.bpp));
return FALSE;
@@ -590,8 +611,8 @@ ico_load_layer (FILE *fp,
GeglBuffer *buffer;
gchar name[ICO_MAXBUF];
- if ( fseek (fp, info->offset, SEEK_SET) < 0
- || !ico_read_int32 (fp, &first_bytes, 1) )
+ if (fseek (fp, info->offset, SEEK_SET) < 0 ||
+ ! ico_read_int32 (fp, &first_bytes, 1))
return -1;
if (first_bytes == ICO_PNG_MAGIC)
@@ -643,7 +664,7 @@ ico_load_image (const gchar *filename,
gimp_filename_to_utf8 (filename));
fp = g_fopen (filename, "rb");
- if (! fp )
+ if (! fp)
{
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Could not open '%s' for reading: %s"),
@@ -658,8 +679,8 @@ ico_load_image (const gchar *filename,
return -1;
}
- info = ico_read_info (fp, icon_count);
- if (!info)
+ info = ico_read_info (fp, icon_count, error);
+ if (! info)
{
fclose (fp);
return -1;
@@ -670,12 +691,12 @@ ico_load_image (const gchar *filename,
max_height = 0;
for (i = 0; i < icon_count; i++)
{
- if ( info[i].width > max_width )
+ if (info[i].width > max_width)
max_width = info[i].width;
- if ( info[i].height > max_height )
+ if (info[i].height > max_height)
max_height = info[i].height;
}
- if ( max_width <= 0 || max_height <= 0 )
+ if (max_width <= 0 || max_height <= 0)
{
g_free (info);
fclose (fp);
@@ -721,7 +742,7 @@ ico_load_thumbnail_image (const gchar *filename,
gimp_filename_to_utf8 (filename));
fp = g_fopen (filename, "rb");
- if (! fp )
+ if (! fp)
{
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Could not open '%s' for reading: %s"),
@@ -730,7 +751,7 @@ ico_load_thumbnail_image (const gchar *filename,
}
icon_count = ico_read_init (fp);
- if (! icon_count )
+ if (! icon_count)
{
fclose (fp);
return -1;
@@ -739,8 +760,8 @@ ico_load_thumbnail_image (const gchar *filename,
D(("*** %s: Microsoft icon file, containing %i icon(s)\n",
filename, icon_count));
- info = ico_read_info (fp, icon_count);
- if (! info )
+ info = ico_read_info (fp, icon_count, error);
+ if (! info)
{
fclose (fp);
return -1;
@@ -758,9 +779,9 @@ ico_load_thumbnail_image (const gchar *filename,
match = i;
}
- else if ( w == info[i].width
- && h == info[i].height
- && info[i].bpp > bpp )
+ else if (w == info[i].width &&
+ h == info[i].height &&
+ info[i].bpp > bpp)
{
/* better quality */
bpp = info[i].bpp;
--
cgit v0.12
|