Skip to content

Commit 9bde1b7

Browse files
committed
Merge tag 'v1.6.55' into branch 'libpng18' into develop
2 parents 09cf01d + 28ae89e commit 9bde1b7

File tree

12 files changed

+57
-24
lines changed

12 files changed

+57
-24
lines changed

.markdownlint.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Markdownlint configuration
2+
# See https://github.com/markdownlint/markdownlint/blob/main/docs/RULES.md
3+
4+
# MD004
5+
ul-style:
6+
style: sublist
7+
8+
# MD007
9+
ul-indent:
10+
start_indented: true
11+
start_indent: 1
12+
indent: 3
13+
14+
# MD012
15+
no-multiple-blanks:
16+
maximum: 2
17+
18+
# MD024
19+
no-duplicate-heading: false
20+
21+
# MD025
22+
single-title: false
23+
24+
# MD028
25+
no-blanks-blockquote: false

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Authors, for copyright and licensing purposes.
1818
* Guy Eric Schalnat
1919
* James Yu
2020
* John Bowler
21+
* Joshua Inscoe
2122
* Kevin Bracey
2223
* Lucas Chollet
2324
* Maarten Bent

CHANGES

Lines changed: 10 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,16 +6323,23 @@ 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.)
6339+
63336340
Version 2.0.0 [TODO]
63346341

63356342
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
63366343
Subscription is required; visit
6337-
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
6344+
<https://lists.sourceforge.net/lists/listinfo/png-mng-implement>
63386345
to subscribe.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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

TODO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TODO list for libpng
2-
--------------------
2+
====================
33

44
* Fix all defects (duh!)
55
* cHRM transformation.

ci/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Scripts for the Continuous Integration of the PNG Reference Library
44
Copyright Notice
55
----------------
66

7-
Copyright (c) 2019-2025 Cosmin Truta.
7+
Copyright (c) 2019-2026 Cosmin Truta.
88

99
Use, modification and distribution are subject to the MIT License.
1010
Please see the accompanying file `LICENSE_MIT.txt` or visit
11-
https://opensource.org/license/mit
11+
<https://opensource.org/license/mit>
1212

1313
File List
1414
---------

manuals/libpng-manual.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
libpng-manual.txt - A description on how to use and modify libpng
22

3-
Copyright (c) 2018-2025 Cosmin Truta
3+
Copyright (c) 2018-2026 Cosmin Truta
44
Copyright (c) 1998-2018 Glenn Randers-Pehrson
55

66
This document is released under the libpng license.
@@ -9,7 +9,7 @@ libpng-manual.txt - A description on how to use and modify libpng
99

1010
Based on:
1111

12-
libpng version 1.6.36, December 2018, through 1.6.54 - January 2026
12+
libpng version 1.6.36, December 2018, through 1.6.55 - February 2026
1313
Updated and distributed by Cosmin Truta
1414
Copyright (c) 2018-2026 Cosmin Truta
1515

manuals/libpng.3

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH LIBPNG 3 "January 12, 2026"
1+
.TH LIBPNG 3 "February 9, 2026"
22
.SH NAME
33
libpng \- Portable Network Graphics (PNG) Reference Library 1.8.0.git
44

@@ -507,7 +507,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
507507
.SH LIBPNG.TXT
508508
libpng-manual.txt - A description on how to use and modify libpng
509509

510-
Copyright (c) 2018-2025 Cosmin Truta
510+
Copyright (c) 2018-2026 Cosmin Truta
511511
Copyright (c) 1998-2018 Glenn Randers-Pehrson
512512

513513
This document is released under the libpng license.
@@ -516,7 +516,7 @@ libpng-manual.txt - A description on how to use and modify libpng
516516

517517
Based on:
518518

519-
libpng version 1.6.36, December 2018, through 1.6.54 - January 2026
519+
libpng version 1.6.36, December 2018, through 1.6.55 - February 2026
520520
Updated and distributed by Cosmin Truta
521521
Copyright (c) 2018-2026 Cosmin Truta
522522

manuals/png.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH PNG 5 "January 12, 2026"
1+
.TH PNG 5 "February 9, 2026"
22
.SH NAME
33
png \- Portable Network Graphics (PNG) format
44

png.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
1515
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
1616
* Glenn Randers-Pehrson
17-
* libpng versions 1.6.36, December 2018, through 1.6.54, January 2026:
17+
* libpng versions 1.6.36, December 2018, through 1.6.55, February 2026:
1818
* Cosmin Truta
1919
* See also "Contributing Authors", below.
2020
*/

0 commit comments

Comments
 (0)