Skip to content

Commit adfd191

Browse files
jayathirthraoRealCLanger
authored andcommitted
8377526: Update Libpng to 1.6.55
Backport-of: fd74232 (cherry picked from commit 4a51260)
1 parent 96d0eaa commit adfd191

8 files changed

Lines changed: 32 additions & 25 deletions

File tree

src/java.desktop/share/legal/libpng.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## libpng v1.6.54
1+
## libpng v1.6.55
22

33
### libpng License
44
<pre>
@@ -170,6 +170,7 @@ Authors, for copyright and licensing purposes.
170170
* Guy Eric Schalnat
171171
* James Yu
172172
* John Bowler
173+
* Joshua Inscoe
173174
* Kevin Bracey
174175
* Lucas Chollet
175176
* Magnus Holmgren

src/java.desktop/share/native/libsplashscreen/libpng/CHANGES

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5988,7 +5988,7 @@ Version 1.6.32rc01 [August 18, 2017]
59885988

59895989
Version 1.6.32rc02 [August 22, 2017]
59905990
Added contrib/oss-fuzz directory which contains files used by the oss-fuzz
5991-
project (https://github.com/google/oss-fuzz/tree/master/projects/libpng).
5991+
project <https://github.com/google/oss-fuzz/tree/master/projects/libpng>.
59925992

59935993
Version 1.6.32 [August 24, 2017]
59945994
No changes.
@@ -6323,15 +6323,21 @@ Version 1.6.53 [December 5, 2025]
63236323

63246324
Version 1.6.54 [January 12, 2026]
63256325
Fixed CVE-2026-22695 (medium severity):
6326-
Heap buffer over-read in `png_image_read_direct_scaled.
6326+
Heap buffer over-read in `png_image_read_direct_scaled`.
63276327
(Reported and fixed by Petr Simecek.)
63286328
Fixed CVE-2026-22801 (medium severity):
63296329
Integer truncation causing heap buffer over-read in `png_image_write_*`.
63306330
Implemented various improvements in oss-fuzz.
63316331
(Contributed by Philippe Antoine.)
63326332

6333+
Version 1.6.55 [February 9, 2026]
6334+
Fixed CVE-2026-25646 (high severity):
6335+
Heap buffer overflow in `png_set_quantize`.
6336+
(Reported and fixed by Joshua Inscoe.)
6337+
Resolved an oss-fuzz build issue involving nalloc.
6338+
(Contributed by Philippe Antoine.)
63336339

63346340
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
63356341
Subscription is required; visit
6336-
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
6342+
<https://lists.sourceforge.net/lists/listinfo/png-mng-implement>
63376343
to subscribe.

src/java.desktop/share/native/libsplashscreen/libpng/README

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README for libpng version 1.6.54
1+
README for libpng version 1.6.55
22
================================
33

44
See the note about version numbers near the top of `png.h`.
@@ -24,27 +24,27 @@ for more things than just PNG files. You can use zlib as a drop-in
2424
replacement for `fread()` and `fwrite()`, if you are so inclined.
2525

2626
zlib should be available at the same place that libpng is, or at
27-
https://zlib.net .
27+
<https://zlib.net>.
2828

2929
You may also want a copy of the PNG specification. It is available
3030
as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find
31-
these at http://www.libpng.org/pub/png/pngdocs.html .
31+
these at <http://www.libpng.org/pub/png/pngdocs.html>.
3232

33-
This code is currently being archived at https://libpng.sourceforge.io
34-
in the download area, and at http://libpng.download/src .
33+
This code is currently being archived at <https://libpng.sourceforge.io>
34+
in the download area, and at <http://libpng.download/src>.
3535

3636
This release, based in a large way on Glenn's, Guy's and Andreas'
3737
earlier work, was created and will be supported by myself and the PNG
3838
development group.
3939

4040
Send comments, corrections and commendations to `png-mng-implement`
4141
at `lists.sourceforge.net`. (Subscription is required; visit
42-
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
42+
<https://lists.sourceforge.net/lists/listinfo/png-mng-implement>
4343
to subscribe.)
4444

4545
Send general questions about the PNG specification to `png-mng-misc`
4646
at `lists.sourceforge.net`. (Subscription is required; visit
47-
https://lists.sourceforge.net/lists/listinfo/png-mng-misc
47+
<https://lists.sourceforge.net/lists/listinfo/png-mng-misc>
4848
to subscribe.)
4949

5050
Historical notes

src/java.desktop/share/native/libsplashscreen/libpng/png.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include "pngpriv.h"
4343

4444
/* Generate a compiler error if there is an old png.h in the search path. */
45-
typedef png_libpng_version_1_6_54 Your_png_h_is_not_version_1_6_54;
45+
typedef png_libpng_version_1_6_55 Your_png_h_is_not_version_1_6_55;
4646

4747
/* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
4848
* corresponding macro definitions. This causes a compile time failure if
@@ -849,7 +849,7 @@ png_get_copyright(png_const_structrp png_ptr)
849849
return PNG_STRING_COPYRIGHT
850850
#else
851851
return PNG_STRING_NEWLINE \
852-
"libpng version 1.6.54" PNG_STRING_NEWLINE \
852+
"libpng version 1.6.55" PNG_STRING_NEWLINE \
853853
"Copyright (c) 2018-2026 Cosmin Truta" PNG_STRING_NEWLINE \
854854
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
855855
PNG_STRING_NEWLINE \

src/java.desktop/share/native/libsplashscreen/libpng/png.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* However, the following notice accompanied the original version of this
3030
* file and, per its terms, should not be removed:
3131
*
32-
* libpng version 1.6.54
32+
* libpng version 1.6.55
3333
*
3434
* Copyright (c) 2018-2026 Cosmin Truta
3535
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -43,7 +43,7 @@
4343
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
4444
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
4545
* Glenn Randers-Pehrson
46-
* libpng versions 1.6.36, December 2018, through 1.6.54, January 2026:
46+
* libpng versions 1.6.36, December 2018, through 1.6.55, February 2026:
4747
* Cosmin Truta
4848
* See also "Contributing Authors", below.
4949
*/
@@ -267,7 +267,7 @@
267267
* ...
268268
* 1.5.30 15 10530 15.so.15.30[.0]
269269
* ...
270-
* 1.6.54 16 10654 16.so.16.54[.0]
270+
* 1.6.55 16 10655 16.so.16.55[.0]
271271
*
272272
* Henceforth the source version will match the shared-library major and
273273
* minor numbers; the shared-library major version number will be used for
@@ -303,7 +303,7 @@
303303
*/
304304

305305
/* Version information for png.h - this should match the version in png.c */
306-
#define PNG_LIBPNG_VER_STRING "1.6.54"
306+
#define PNG_LIBPNG_VER_STRING "1.6.55"
307307
#define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
308308

309309
/* The versions of shared library builds should stay in sync, going forward */
@@ -314,7 +314,7 @@
314314
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
315315
#define PNG_LIBPNG_VER_MAJOR 1
316316
#define PNG_LIBPNG_VER_MINOR 6
317-
#define PNG_LIBPNG_VER_RELEASE 54
317+
#define PNG_LIBPNG_VER_RELEASE 55
318318

319319
/* This should be zero for a public release, or non-zero for a
320320
* development version.
@@ -345,7 +345,7 @@
345345
* From version 1.0.1 it is:
346346
* XXYYZZ, where XX=major, YY=minor, ZZ=release
347347
*/
348-
#define PNG_LIBPNG_VER 10654 /* 1.6.54 */
348+
#define PNG_LIBPNG_VER 10655 /* 1.6.55 */
349349

350350
/* Library configuration: these options cannot be changed after
351351
* the library has been built.
@@ -455,7 +455,7 @@ extern "C" {
455455
/* This triggers a compiler error in png.c, if png.c and png.h
456456
* do not agree upon the version number.
457457
*/
458-
typedef char *png_libpng_version_1_6_54;
458+
typedef char *png_libpng_version_1_6_55;
459459

460460
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
461461
*

src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* However, the following notice accompanied the original version of this
3030
* file and, per its terms, should not be removed:
3131
*
32-
* libpng version 1.6.54
32+
* libpng version 1.6.55
3333
*
3434
* Copyright (c) 2018-2026 Cosmin Truta
3535
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson

src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* However, the following notice accompanied the original version of this
3232
* file and, per its terms, should not be removed:
3333
*/
34-
/* libpng version 1.6.54 */
34+
/* libpng version 1.6.55 */
3535

3636
/* Copyright (c) 2018-2026 Cosmin Truta */
3737
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */

src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* However, the following notice accompanied the original version of this
3030
* file and, per its terms, should not be removed:
3131
*
32-
* Copyright (c) 2018-2025 Cosmin Truta
32+
* Copyright (c) 2018-2026 Cosmin Truta
3333
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
3434
* Copyright (c) 1996-1997 Andreas Dilger
3535
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -737,8 +737,8 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
737737
break;
738738

739739
t->next = hash[d];
740-
t->left = (png_byte)i;
741-
t->right = (png_byte)j;
740+
t->left = png_ptr->palette_to_index[i];
741+
t->right = png_ptr->palette_to_index[j];
742742
hash[d] = t;
743743
}
744744
}

0 commit comments

Comments
 (0)