Merge pull request #3 from sincos2854/master

Update libpng version to 1.6.40 and fix memory allocation
uyjulian · Jul 4, 2023 · 8262ded · 8262ded
2 parents 6ac4e43 + 837422b
commit 8262ded
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -159,7 +159,7 @@ DEPENDENCY_SOURCE_FILE_ZLIB := $(DEPENDENCY_SOURCE_DIRECTORY)/zlib.tar.xz
 DEPENDENCY_SOURCE_FILE_LIBPNG := $(DEPENDENCY_SOURCE_DIRECTORY)/libpng.tar.xz
 
 DEPENDENCY_SOURCE_URL_ZLIB := https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz
-DEPENDENCY_SOURCE_URL_LIBPNG := https://downloads.sourceforge.net/project/libpng/libpng16/1.6.39/libpng-1.6.39.tar.xz
+DEPENDENCY_SOURCE_URL_LIBPNG := https://downloads.sourceforge.net/project/libpng/libpng16/1.6.40/libpng-1.6.40.tar.xz
 
 $(DEPENDENCY_SOURCE_FILE_ZLIB): | $(DEPENDENCY_SOURCE_DIRECTORY)
 	curl --location --output $@ $(DEPENDENCY_SOURCE_URL_ZLIB)

diff --git a/extractor.c b/extractor.c
@@ -227,7 +227,7 @@ int GetPictureEx(size_t data_size, HANDLE *bitmap_info, HANDLE *bitmap_data,
 	if (getBMPFromPNG((const uint8_t *)data, data_size, &bitmap_file_header,
 	                   &bitmap_info_header, &data_u8))
 		return SPI_MEMORY_ERROR;
-	*bitmap_info = LocalAlloc(LMEM_MOVEABLE, sizeof(BITMAPINFOHEADER));
+	*bitmap_info = LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT, sizeof(BITMAPINFO));
 	*bitmap_data = LocalAlloc(LMEM_MOVEABLE, bitmap_file_header.bfSize -
 	                                             bitmap_file_header.bfOffBits);
 	if (*bitmap_info == NULL || *bitmap_data == NULL) {