francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
112 lines
4.4 KiB
Diff
112 lines
4.4 KiB
Diff
From 0fa3c0f698c2ca618a0fa44e10a822678df85373 Mon Sep 17 00:00:00 2001
|
|
From: Cosmin Truta <ctruta@gmail.com>
|
|
Date: Thu, 15 Feb 2024 21:53:24 +0200
|
|
Subject: [PATCH] chore: Clean up the spurious uses of `sizeof(png_byte)`; fix
|
|
the manual
|
|
|
|
By definition, `sizeof(png_byte)` is 1.
|
|
|
|
Remove all the occurences of `sizeof(png_byte)` from the code, and fix
|
|
a related typo in the libpng manual.
|
|
|
|
Also update the main .editorconfig file to reflect the fixing expected
|
|
by a FIXME note.
|
|
|
|
CVE: CVE-2025-64505
|
|
Upstream-Status: Backport [https://github.com/pnggroup/libpng/commit/0fa3c0f698c2ca618a0fa44e10a822678df85373]
|
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
|
---
|
|
libpng-manual.txt | 4 ++--
|
|
libpng.3 | 4 ++--
|
|
pngrtran.c | 17 +++++++----------
|
|
3 files changed, 11 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/libpng-manual.txt b/libpng-manual.txt
|
|
index eb24ef483..d2918ce31 100644
|
|
--- a/libpng-manual.txt
|
|
+++ b/libpng-manual.txt
|
|
@@ -1178,11 +1178,11 @@ where row_pointers is an array of pointers to the pixel data for each row:
|
|
If you know your image size and pixel size ahead of time, you can allocate
|
|
row_pointers prior to calling png_read_png() with
|
|
|
|
- if (height > PNG_UINT_32_MAX/(sizeof (png_byte)))
|
|
+ if (height > PNG_UINT_32_MAX / (sizeof (png_bytep)))
|
|
png_error(png_ptr,
|
|
"Image is too tall to process in memory");
|
|
|
|
- if (width > PNG_UINT_32_MAX/pixel_size)
|
|
+ if (width > PNG_UINT_32_MAX / pixel_size)
|
|
png_error(png_ptr,
|
|
"Image is too wide to process in memory");
|
|
|
|
diff --git a/libpng.3 b/libpng.3
|
|
index 57d06f2db..8875b219a 100644
|
|
--- a/libpng.3
|
|
+++ b/libpng.3
|
|
@@ -1697,11 +1697,11 @@ where row_pointers is an array of pointers to the pixel data for each row:
|
|
If you know your image size and pixel size ahead of time, you can allocate
|
|
row_pointers prior to calling png_read_png() with
|
|
|
|
- if (height > PNG_UINT_32_MAX/(sizeof (png_byte)))
|
|
+ if (height > PNG_UINT_32_MAX / (sizeof (png_bytep)))
|
|
png_error(png_ptr,
|
|
"Image is too tall to process in memory");
|
|
|
|
- if (width > PNG_UINT_32_MAX/pixel_size)
|
|
+ if (width > PNG_UINT_32_MAX / pixel_size)
|
|
png_error(png_ptr,
|
|
"Image is too wide to process in memory");
|
|
|
|
diff --git a/pngrtran.c b/pngrtran.c
|
|
index 74cca476b..041f9306c 100644
|
|
--- a/pngrtran.c
|
|
+++ b/pngrtran.c
|
|
@@ -441,7 +441,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
|
|
int i;
|
|
|
|
png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
|
|
- (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
|
|
+ (png_alloc_size_t)num_palette);
|
|
for (i = 0; i < num_palette; i++)
|
|
png_ptr->quantize_index[i] = (png_byte)i;
|
|
}
|
|
@@ -458,7 +458,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
|
|
|
|
/* Initialize an array to sort colors */
|
|
png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
|
|
- (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
|
|
+ (png_alloc_size_t)num_palette);
|
|
|
|
/* Initialize the quantize_sort array */
|
|
for (i = 0; i < num_palette; i++)
|
|
@@ -592,11 +592,9 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
|
|
|
|
/* Initialize palette index arrays */
|
|
png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
|
|
- (png_alloc_size_t)((png_uint_32)num_palette *
|
|
- (sizeof (png_byte))));
|
|
+ (png_alloc_size_t)num_palette);
|
|
png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
|
|
- (png_alloc_size_t)((png_uint_32)num_palette *
|
|
- (sizeof (png_byte))));
|
|
+ (png_alloc_size_t)num_palette);
|
|
|
|
/* Initialize the sort array */
|
|
for (i = 0; i < num_palette; i++)
|
|
@@ -761,12 +759,11 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
|
|
size_t num_entries = ((size_t)1 << total_bits);
|
|
|
|
png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
|
|
- (png_alloc_size_t)(num_entries * (sizeof (png_byte))));
|
|
+ (png_alloc_size_t)(num_entries));
|
|
|
|
- distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)(num_entries *
|
|
- (sizeof (png_byte))));
|
|
+ distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)num_entries);
|
|
|
|
- memset(distance, 0xff, num_entries * (sizeof (png_byte)));
|
|
+ memset(distance, 0xff, num_entries);
|
|
|
|
for (i = 0; i < num_palette; i++)
|
|
{
|