libgd
/
libgd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #755 from libgd/bug/750 

Partial fix for #750, BMP and WebP. Gif's usage of PutBuf needs too much refactoring for the actual gain here."
master
Pierre Joye 2021-09-08 10:08:12 +07:00 committed by GitHub
parent 16ebd800f7 75fecefe77
commit 6f5136821b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gd_bmp.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "gd.h" #include "gd.h"
#include "gdhelpers.h" #include "gdhelpers.h"
#include "gd_errors.h"
#include "bmp.h" #include "bmp.h"
static int compress_row(unsigned char *uncompressed_row, int length); static int compress_row(unsigned char *uncompressed_row, int length);
@ -266,7 +267,11 @@ static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
bitmap_size += compressed_size; bitmap_size += compressed_size;
gdPutBuf(uncompressed_row, compressed_size, out); if (gdPutBuf(uncompressed_row, compressed_size, out) != compressed_size){
gd_error("gd-bmp write error\n");
error = 1;
break;
}
gdPutC(BMP_RLE_COMMAND, out); gdPutC(BMP_RLE_COMMAND, out);
gdPutC(BMP_RLE_ENDOFLINE, out); gdPutC(BMP_RLE_ENDOFLINE, out);
bitmap_size += 2; bitmap_size += 2;
@ -325,7 +330,10 @@ static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
if (buffer_size == 0) { if (buffer_size == 0) {
break; break;
} }
gdPutBuf(copy_buffer , buffer_size, out_original); if (gdPutBuf(copy_buffer , buffer_size, out_original) != buffer_size) {
gd_error("gd-bmp write error\n");
error = 1;
}
} }
gdFree(copy_buffer); gdFree(copy_buffer);
@ -335,7 +343,7 @@ static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
out_original = NULL; out_original = NULL;
} }
ret = 0; ret = error;
cleanup: cleanup:
if (tmpfile_for_compression) { if (tmpfile_for_compression) {
#ifdef _WIN32 #ifdef _WIN32

7
src/gd_webp.c
View File

@ -227,8 +227,13 @@ static int _gdImageWebpCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
ret = 1; ret = 1;
goto freeargb; goto freeargb;
} }
gdPutBuf(out, out_size, outfile);
int res = gdPutBuf(out, out_size, outfile);
free(out); free(out);
if (res != out_size) {
gd_error("gd-webp write error\n");
ret = 1;
}
freeargb: freeargb:
gdFree(argb); gdFree(argb);