From: Daniel Lehman <dlehman25@gmail.com> CVE-2026-25646 --- libs/png/AUTHORS | 1 + libs/png/png.c | 4 ++-- libs/png/png.h | 14 +++++++------- libs/png/pngconf.h | 2 +- libs/png/pnglibconf.h | 2 +- libs/png/pngrtran.c | 6 +++--- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libs/png/AUTHORS b/libs/png/AUTHORS index b9c0fffcfd7..4094f4a57d6 100644 --- a/libs/png/AUTHORS +++ b/libs/png/AUTHORS @@ -17,6 +17,7 @@ Authors, for copyright and licensing purposes. * Guy Eric Schalnat * James Yu * John Bowler + * Joshua Inscoe * Kevin Bracey * Lucas Chollet * Magnus Holmgren diff --git a/libs/png/png.c b/libs/png/png.c index d184a306d54..a0cad0197e7 100644 --- a/libs/png/png.c +++ b/libs/png/png.c @@ -13,7 +13,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_54 Your_png_h_is_not_version_1_6_54; +typedef png_libpng_version_1_6_55 Your_png_h_is_not_version_1_6_55; /* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the * corresponding macro definitions. This causes a compile time failure if @@ -820,7 +820,7 @@ png_get_copyright(png_const_structrp png_ptr) return PNG_STRING_COPYRIGHT #else return PNG_STRING_NEWLINE \ - "libpng version 1.6.54" PNG_STRING_NEWLINE \ + "libpng version 1.6.55" PNG_STRING_NEWLINE \ "Copyright (c) 2018-2026 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ diff --git a/libs/png/png.h b/libs/png/png.h index 84ddff1980b..38fd349e5fb 100644 --- a/libs/png/png.h +++ b/libs/png/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.54 + * libpng version 1.6.55 * * Copyright (c) 2018-2026 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson @@ -14,7 +14,7 @@ * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson - * libpng versions 1.6.36, December 2018, through 1.6.54, January 2026: + * libpng versions 1.6.36, December 2018, through 1.6.55, February 2026: * Cosmin Truta * See also "Contributing Authors", below. */ @@ -238,7 +238,7 @@ * ... * 1.5.30 15 10530 15.so.15.30[.0] * ... - * 1.6.54 16 10654 16.so.16.54[.0] + * 1.6.55 16 10655 16.so.16.55[.0] * * Henceforth the source version will match the shared-library major and * minor numbers; the shared-library major version number will be used for @@ -274,7 +274,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.54" +#define PNG_LIBPNG_VER_STRING "1.6.55" #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n" /* The versions of shared library builds should stay in sync, going forward */ @@ -285,7 +285,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 54 +#define PNG_LIBPNG_VER_RELEASE 55 /* This should be zero for a public release, or non-zero for a * development version. @@ -316,7 +316,7 @@ * From version 1.0.1 it is: * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10654 /* 1.6.54 */ +#define PNG_LIBPNG_VER 10655 /* 1.6.55 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -426,7 +426,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char *png_libpng_version_1_6_54; +typedef char *png_libpng_version_1_6_55; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/libs/png/pngconf.h b/libs/png/pngconf.h index 1f511f57c1f..45084524197 100644 --- a/libs/png/pngconf.h +++ b/libs/png/pngconf.h @@ -1,6 +1,6 @@ /* pngconf.h - machine-configurable file for libpng * - * libpng version 1.6.54 + * libpng version 1.6.55 * * Copyright (c) 2018-2026 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson diff --git a/libs/png/pnglibconf.h b/libs/png/pnglibconf.h index 0593f41b989..95f24783959 100644 --- a/libs/png/pnglibconf.h +++ b/libs/png/pnglibconf.h @@ -1,6 +1,6 @@ /* pnglibconf.h - library build configuration */ -/* libpng version 1.6.54 */ +/* libpng version 1.6.55 */ /* Copyright (c) 2018-2026 Cosmin Truta */ /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */ diff --git a/libs/png/pngrtran.c b/libs/png/pngrtran.c index fe8f9d32c98..1fce9af121d 100644 --- a/libs/png/pngrtran.c +++ b/libs/png/pngrtran.c @@ -1,6 +1,6 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Copyright (c) 2018-2025 Cosmin Truta + * Copyright (c) 2018-2026 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -708,8 +708,8 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette, break; t->next = hash[d]; - t->left = (png_byte)i; - t->right = (png_byte)j; + t->left = png_ptr->palette_to_index[i]; + t->right = png_ptr->palette_to_index[j]; hash[d] = t; } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10527