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
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
|
# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1680966869 18000
# Node ID 27a561878992e8588a9c80f3fce51e66e0b55ebc
# Parent 5509b7e1b29b17b823d6bfdcf7d1519092bf7d8a
Address issues from SourceForge issue #706 test case 'bug11'
diff -r 5509b7e1b29b -r 27a561878992 ChangeLog
--- a/ChangeLog Sun Apr 02 17:02:20 2023 -0500
+++ b/ChangeLog Sat Apr 08 10:14:29 2023 -0500
@@ -1,3 +1,14 @@
+2023-04-08 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * coders/mpc.c (ReadMPCImage): If an attribute appears multiple
+ times in the MPC header, only set it once.
+
+ * coders/miff.c (ReadMIFFImage): If an attribute appears multiple
+ times in the MIFF header, only set it once.
+
+ * magick/attribute.c (SetImageAttribute): Fix bounds issue when
+ concatenating string (SourceForge issue #706 test case 'bug11');
+
2023-01-14 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* version.sh: Updated for 1.3.40 release.
diff -r 5509b7e1b29b -r 27a561878992 coders/miff.c
--- a/coders/miff.c Sun Apr 02 17:02:20 2023 -0500
+++ b/coders/miff.c Sat Apr 08 10:14:29 2023 -0500
@@ -752,6 +752,23 @@
#define ReadMIFFMaxKeyWordCount 256 /* Arbitrary limit on keywords in one MIFF frame */
+/*
+ Ignore attempts to set the same attribute multiple times.
+*/
+static MagickPassFail
+SetNewImageAttribute(Image *image,const char *key,const char *value)
+{
+ MagickPassFail
+ status;
+
+ if (GetImageAttribute(image,key) == (const ImageAttribute *) NULL)
+ status = SetImageAttribute(image,key,value);
+ else
+ status = MagickFail;
+
+ return status;
+};
+
static Image *ReadMIFFImage(const ImageInfo *image_info,
ExceptionInfo *exception)
{
@@ -926,7 +943,7 @@
image);
*p='\0';
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Comment: \"%s\"", comment);
- (void) SetImageAttribute(image,"comment",comment);
+ (void) SetNewImageAttribute(image,"comment",comment);
comment_count++;
MagickFreeResourceLimitedMemory(comment);
c=ReadBlobByte(image);
@@ -1060,7 +1077,7 @@
exception);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1135,7 +1152,7 @@
image->columns= MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1165,7 +1182,7 @@
image->dispose=PreviousDispose;
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1184,7 +1201,7 @@
&image->chromaticity.green_primary.y);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1201,7 +1218,7 @@
image->iterations=MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1225,7 +1242,7 @@
(void) CloneString(&image->montage,values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1243,7 +1260,7 @@
image->orientation=StringToOrientationType(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1281,7 +1298,7 @@
number_of_profiles++;
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1322,7 +1339,7 @@
image->rows= MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1334,7 +1351,7 @@
image->scene=MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1351,7 +1368,7 @@
image->units=PixelsPerCentimeterResolution;
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1363,7 +1380,7 @@
version=MagickAtoF(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -1377,13 +1394,13 @@
&image->chromaticity.white_point.y);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
default:
{
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
diff -r 5509b7e1b29b -r 27a561878992 coders/mpc.c
--- a/coders/mpc.c Sun Apr 02 17:02:20 2023 -0500
+++ b/coders/mpc.c Sat Apr 08 10:14:29 2023 -0500
@@ -1,5 +1,5 @@
/*
-% Copyright (C) 2003-2022 GraphicsMagick Group
+% Copyright (C) 2003-2023 GraphicsMagick Group
% Copyright (C) 2002 ImageMagick Studio
%
% This program is covered by multiple licenses, which are described in
@@ -146,6 +146,23 @@
#define ReadMPCMaxKeyWordCount 256 /* Arbitrary limit on number of keywords in MPC frame */
+/*
+ Ignore attempts to set the same attribute multiple times.
+*/
+static MagickPassFail
+SetNewImageAttribute(Image *image,const char *key,const char *value)
+{
+ MagickPassFail
+ status;
+
+ if (GetImageAttribute(image,key) == (const ImageAttribute *) NULL)
+ status = SetImageAttribute(image,key,value);
+ else
+ status = MagickFail;
+
+ return status;
+};
+
static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
@@ -294,7 +311,7 @@
ThrowMPCReaderException(ResourceLimitError,MemoryAllocationFailed,
image);
*p='\0';
- (void) SetImageAttribute(image,"comment",comment);
+ (void) SetNewImageAttribute(image,"comment",comment);
comment_count++;
MagickFreeResourceLimitedMemory(comment);
c=ReadBlobByte(image);
@@ -429,7 +446,7 @@
exception);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -493,7 +510,7 @@
image->columns= MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -523,7 +540,7 @@
image->dispose=PreviousDispose;
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -535,7 +552,7 @@
image->error.mean_error_per_pixel=MagickAtoF(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -560,7 +577,7 @@
&image->chromaticity.green_primary.y);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -577,7 +594,7 @@
image->iterations=MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -617,7 +634,7 @@
(void) CloneString(&image->montage,values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -635,7 +652,7 @@
image->orientation=StringToOrientationType(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -671,7 +688,7 @@
number_of_profiles++;
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -683,7 +700,7 @@
quantum_depth=MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -724,7 +741,7 @@
image->rows=MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -736,7 +753,7 @@
image->scene=MagickAtoL(values);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -753,7 +770,7 @@
image->units=PixelsPerCentimeterResolution;
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
@@ -767,13 +784,13 @@
&image->chromaticity.white_point.y);
break;
}
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
default:
{
- (void) SetImageAttribute(image,keyword,
+ (void) SetNewImageAttribute(image,keyword,
*values == '{' ? values+1 : values);
break;
}
diff -r 5509b7e1b29b -r 27a561878992 magick/attribute.c
--- a/magick/attribute.c Sun Apr 02 17:02:20 2023 -0500
+++ b/magick/attribute.c Sat Apr 08 10:14:29 2023 -0500
@@ -1,5 +1,5 @@
/*
-% Copyright (C) 2003-2022 GraphicsMagick Group
+% Copyright (C) 2003-2023 GraphicsMagick Group
% Copyright (C) 2002 ImageMagick Studio
%
% This program is covered by multiple licenses, which are described in
@@ -3294,15 +3294,18 @@
else
{
/*
- Extend existing text string.
+ Extend existing text string. This functionality is deprecated!
*/
min_l=p->length+attribute->length+1;
for (realloc_l=2; realloc_l <= min_l; realloc_l *= 2)
{ /* nada */};
MagickReallocMemory(char *,p->value,realloc_l);
if (p->value != (char *) NULL)
- (void) strlcat(p->value+p->length,attribute->value,min_l);
- p->length += attribute->length;
+ {
+ (void) memcpy(p->value+p->length,attribute->value,min_l-p->length-1);
+ p->length += attribute->length;
+ p->value[p->length] = '\0';
+ }
DestroyImageAttribute(attribute);
}
if (p->value != (char *) NULL)
diff -r 5509b7e1b29b -r 27a561878992 www/Changelog.html
--- a/www/Changelog.html Sun Apr 02 17:02:20 2023 -0500
+++ b/www/Changelog.html Sat Apr 08 10:14:29 2023 -0500
@@ -37,6 +37,17 @@
</div>
<div class="document">
+<p>2023-04-08 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/mpc.c (ReadMPCImage): If an attribute appears multiple
+times in the MPC header, only set it once.</p></li>
+<li><p>coders/miff.c (ReadMIFFImage): If an attribute appears multiple
+times in the MIFF header, only set it once.</p></li>
+<li><p>magick/attribute.c (SetImageAttribute): Fix bounds issue when
+concatenating string (SourceForge issue #706 test case 'bug11');</p></li>
+</ul>
+</blockquote>
<p>2023-01-14 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
<blockquote>
<ul class="simple">
|
