Skip to content

Commit 6b6bff0

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/issues/1199
1 parent c7537dd commit 6b6bff0

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

Diff for: coders/cals.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ static Image *ReadCALSImage(const ImageInfo *image_info,
257257
if ((unique_file == -1) || (file == (FILE *) NULL))
258258
ThrowImageException(FileOpenError,"UnableToCreateTemporaryFile");
259259
while ((c=ReadBlobByte(image)) != EOF)
260-
(void) fputc(c,file);
260+
if (fputc(c,file) != c)
261+
break;
261262
(void) fclose(file);
262263
(void) CloseBlob(image);
263264
image=DestroyImage(image);

Diff for: coders/dcm.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -3228,13 +3228,13 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
32283228
(strncmp(implicit_vr,"SS",2) == 0) ||
32293229
(strncmp(implicit_vr,"US",2) == 0))
32303230
quantum=2;
3231-
else
3231+
else
32323232
if ((strncmp(implicit_vr,"FL",2) == 0) ||
32333233
(strncmp(implicit_vr,"OF",2) == 0) ||
32343234
(strncmp(implicit_vr,"SL",2) == 0) ||
32353235
(strncmp(implicit_vr,"UL",2) == 0))
32363236
quantum=4;
3237-
else
3237+
else
32383238
if (strncmp(implicit_vr,"FD",2) == 0)
32393239
quantum=8;
32403240
else
@@ -3880,7 +3880,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
38803880
"UnexpectedEndOfFile",image->filename);
38813881
break;
38823882
}
3883-
(void) fputc(c,file);
3883+
if (fputc(c,file) != c)
3884+
break;
38843885
}
38853886
(void) fclose(file);
38863887
if (c == EOF)
@@ -3934,7 +3935,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
39343935
length=(size_t) (GetQuantumRange(info.depth)+1);
39353936
if (length > (size_t) GetBlobSize(image))
39363937
ThrowDCMException(CorruptImageError,"InsufficientImageDataInFile");
3937-
if (info.scale != (Quantum *) NULL)
3938+
if (info.scale != (Quantum *) NULL)
39383939
info.scale=(Quantum *) RelinquishMagickMemory(info.scale);
39393940
info.scale=(Quantum *) AcquireQuantumMemory(MagickMax(length,256),
39403941
sizeof(*info.scale));

Diff for: coders/pict.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,8 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
14721472
c=ReadBlobByte(image);
14731473
if (c == EOF)
14741474
break;
1475-
(void) fputc(c,file);
1475+
if (fputc(c,file) != c)
1476+
break;
14761477
}
14771478
}
14781479
(void) fclose(file);

Diff for: coders/pwp.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
233233
c=ReadBlobByte(pwp_image);
234234
if (c == EOF)
235235
break;
236-
(void) fputc(c,file);
236+
if (fputc(c,file) != c)
237+
break;
237238
}
238239
(void) fclose(file);
239240
if (c == EOF)

0 commit comments

Comments
 (0)