3.2 backports 202605 (PR #26447)
60 views
Skip to first unread message
VZ
May 10, 2026, 7:30:45 PMMay 10
to wx-...@googlegroups.com, Subscribed
Latest backports, including the fixes to bitmap (and other file formats) loading.
cc @paulcor
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26447
Commit Summary
- 98ec851 Remove CppUnit boilerplate in wxImage unit test
- 267237d Correct loading of `BI_BITFIELDS` bitmaps
- e4b4f3b Add tests for reading truncated GIF image
- 1e9791a Fix loading BMP files which use 32bpp but do not have valid alpha
- 5ae7907 Fix loading ICO files with alpha broken by parent commit
- 31eab53 Fix loading ICO files with fully transparent alpha
- 861e95e Avoid memory overwrite on malformed BMP with invalid RLE data
- 641cf0e Avoid negative shift count with valid BMP file
- c7378c6 Correct delta-RLE bitmap background colour
- 547dff4 Restore old delta-RLE bitmap background setting
- 1f33c4e Avoid assertion failure on BMP file with invalid or too-large size
- 2a72185 Reduce the scope of some local variables
- 4ccbac5 Up-scale BMP color components using Windows-compatible method
- c5b5d96 Handle BMP alpha the same way Windows does
- d3d3bfc Fix BMP test under Wine
- 5d34b0a Avoid out-of-bounds palette read in 8bpp BMP decoder
- f559a31 Avoid out-of-bounds line-buffer read in wxPCXHandler::LoadFile
- a97fa26 Avoid out-of-bounds read in wxXPMDecoder::ReadFile on unterminated comment
File Changes
(21 files)
- M build/cmake/tests/gui/CMakeLists.txt (9)
- M docs/changes.txt (7)
- M src/common/imagbmp.cpp (250)
- M src/common/imagpcx.cpp (7)
- M src/common/xpmdecod.cpp (5)
- M src/msw/dib.cpp (9)
- M tests/Makefile.in (2)
- A tests/image/32bpp_rgb.bmp (0)
- A tests/image/32bpp_rgb.ico (0)
- A tests/image/32bpp_rgb_a0.ico (0)
- A tests/image/bad_truncated.gif (0)
- A tests/image/badrle4.bmp (0)
- A tests/image/bitfields-alpha.bmp (0)
- M tests/image/image.cpp (345)
- A tests/image/rgb16-3103.bmp (0)
- A tests/image/rgb32-7187.bmp (0)
- A tests/image/rgb32bf.bmp (0)
- A tests/image/rgba32.bmp (0)
- M tests/makefile.gcc (2)
- M tests/makefile.vc (2)
- M tests/test.bkl (11)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26447.patch
- https://github.com/wxWidgets/wxWidgets/pull/26447.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
VZ
May 10, 2026, 9:03:10 PMMay 10
to wx-...@googlegroups.com, Push
@vadz pushed 24 commits.
- 739f81e Stop using Catch::toString()
- 2fb2318 Avoid harmless -Wunused-variable in unit tests
- d1a05d2 Log image information earlier in the image unit test
- 19639fe Relax checks for image equality in wxImage::ChangeColours
- a678b62 Improve wxImage::ChangeColours test code
- ace58a8 Improve TIFF saving test code
- 8730ac1 Remove CppUnit boilerplate in wxImage unit test
- f096c2b Correct loading of `BI_BITFIELDS` bitmaps
- 685daf3 Add tests for reading truncated GIF image
- 7110383 Fix loading BMP files which use 32bpp but do not have valid alpha
- 8df9648 Fix loading ICO files with alpha broken by parent commit
- 4c0ebdc Fix loading ICO files with fully transparent alpha
- cdfcfae Avoid memory overwrite on malformed BMP with invalid RLE data
- 59ec6aa Avoid negative shift count with valid BMP file
- a0fc3bb Correct delta-RLE bitmap background colour
- d2e1330 Restore old delta-RLE bitmap background setting
- 4518dbc Avoid assertion failure on BMP file with invalid or too-large size
- a1ad945 Reduce the scope of some local variables
- a8fbd4a Up-scale BMP color components using Windows-compatible method
- e788a9d Handle BMP alpha the same way Windows does
- 0bab565 Fix BMP test under Wine
- c586ebe Avoid out-of-bounds palette read in 8bpp BMP decoder
- 7ed5c6a Avoid out-of-bounds line-buffer read in wxPCXHandler::LoadFile
- 83e7fdb Avoid out-of-bounds read in wxXPMDecoder::ReadFile on unterminated comment
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 11, 2026, 8:49:22 AMMay 11
to wx-...@googlegroups.com, Push
@vadz pushed 23 commits.
- e0faab1 Avoid harmless -Wunused-variable in unit tests
- ce957f4 Log image information earlier in the image unit test
- 948c625 Relax checks for image equality in wxImage::ChangeColours
- 03d55cc Improve wxImage::ChangeColours test code
- 273a100 Improve TIFF saving test code
- 65a3974 Remove CppUnit boilerplate in wxImage unit test
- 5342ba2 Correct loading of `BI_BITFIELDS` bitmaps
- 33e6f77 Add tests for reading truncated GIF image
- 235cb8b Fix loading BMP files which use 32bpp but do not have valid alpha
- b0db3a9 Fix loading ICO files with alpha broken by parent commit
- 2807118 Fix loading ICO files with fully transparent alpha
- 282d71e Avoid memory overwrite on malformed BMP with invalid RLE data
- f5b1ffe Avoid negative shift count with valid BMP file
- b30bb76 Correct delta-RLE bitmap background colour
- 4adc011 Restore old delta-RLE bitmap background setting
- c83ef31 Avoid assertion failure on BMP file with invalid or too-large size
- 4b9915d Reduce the scope of some local variables
- 1c677c7 Up-scale BMP color components using Windows-compatible method
- 99cd1be Handle BMP alpha the same way Windows does
- fa5dca6 Fix BMP test under Wine
- 94462af Avoid out-of-bounds palette read in 8bpp BMP decoder
- ca1c3f7 Avoid out-of-bounds line-buffer read in wxPCXHandler::LoadFile
- 1a48898 Avoid out-of-bounds read in wxXPMDecoder::ReadFile on unterminated comment
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 11, 2026, 9:06:59 AMMay 11
to wx-...@googlegroups.com, Push
@vadz pushed 1 commit.
- e9c086f Avoid another warning triggered by the last warning workaround
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 18, 2026, 10:48:07 PMMay 18
to wx-...@googlegroups.com, Push
@vadz pushed 5 commits.
- 5c6413d wxGTK: Fix wxTextCtrl crash with GSpell attached
- 1eb48ab Update Poedit links
- 191768e Fix computing wait end time in pthreads wxCondition implementation
- bfdfaa0 Make GTK3 dashed line appearance similar to MSW
- 268d8d5 Make GTK2 dashed line appearance similar to MSW
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 21, 2026, 4:47:49 PM (13 days ago) May 21
to wx-...@googlegroups.com, Push
@vadz pushed 3 commits.
- 3b2774a Fix non-resizable TLW size on GTK when client size is set to initial size
- fb9fc75 OSX 10.10 compatibility for compositing operators
- 0022c8e Avoid out-of-bounds palette write in wxIFFDecoder::ConvertToImage()
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 23, 2026, 12:15:14 PM (11 days ago) May 23
to wx-...@googlegroups.com, Push
@vadz pushed 7 commits.
- 38da54b Add new test GIF image to CMake builds too
- 6001712 Reject BMP RLE absolute runs that overrun the current scanline
- 597c0ab Validate IFF BMHD fields to prevent pixel-buffer overflow
- 61d185f Fix static order initialization problem in wxCSConv
- 2d00db9 Reject GIF files with LZW minimum code size > 11
- 4398e72 Fix memory leak when loading invalid GIF files
- d8dd2ac Stop reading past wxCharBuffer end on unterminated XPM quote
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 25, 2026, 9:11:40 AM (9 days ago) May 25
to wx-...@googlegroups.com, Push
@vadz pushed 7 commits.
- f70412d Reject TGA files with non-zero colour map origin
- cb63e1c Stop reading past data end in truncated IFF BODY decode
- 86ff823 Validate data chunk header room in wxSound::LoadWAV()
- 815860a Reject too-short ZIP64 extra field in wxZipEntry::LoadExtraInfo()
- 1cd880a Fix off-by-one buffer overflow in wxWebViewIE
- 3c0a2ed Fix typo in UuidToCForm format string and use bounded wxSnprintf
- 52c507b Get charset from CHARFORMAT in wxTextCtrl instead of hardcoding ANSI_CHARSET
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 25, 2026, 1:11:13 PM (9 days ago) May 25
to wx-...@googlegroups.com, Push
@vadz pushed 5 commits.
- 9093f4c Reject too-short ZIP64 extra field in wxZipEntry::LoadExtraInfo()
- 3013538 Fix off-by-one buffer overflow in wxWebViewIE
- fbec260 Fix typo in UuidToCForm format string and use bounded wxSnprintf
- a76b6c8 Get charset from CHARFORMAT in wxTextCtrl instead of hardcoding ANSI_CHARSET
- 9897d80 Validate ANI frame indices against loaded icon count
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
May 31, 2026, 10:21:22 AM (3 days ago) May 31
to wx-...@googlegroups.com, Push
@vadz pushed 16 commits.
- c60dbd1 Validate ANI frame indices against loaded icon count
- d301e9e Validate 4-bit BMP palette index against number of colors
- d412564 Fix out-of-bounds table read in wxMBConvUTF7::ToWChar()
- 1175aa0 Fix wxURI::IsReference() description
- 3bc57e4 Fix one-byte over-read in IFF decomprle replicate packet
- 45a4841 Fix buffer overflow when loading invalid message catalogs
- c5e6619 Fix buffer overflow on invalid width in wxXPMDecoder
- 9d7e16a Fix data-size bound check past LIST chunk in wxSound::LoadWAV()
- 9d2a206 Avoid buffer read overflow in wxCharTypeBuffer ctor
- e5c45b5 Make recently added wxXPMDecoder test case really pass
- 4b92a80 Fix buffer overflow in deepCopyHostent() name copy
- 64a52d8 Fix integer overflow in tar extended header bounds check
- c819f19 Fix out-of-bounds read on trailing % in wxFileType::ExpandCommand()
- 0f07f80 Validate decoded pixel indices in wxGIFDecoder::ConvertToImage()
- 3ede092 Avoid writing beyond the buffer end for GIFs with zero size
- d27386e Fix buffer overflow in wxVsnprintf() when size==0
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
May 31, 2026, 11:01:08 AM (3 days ago) May 31
to wx-...@googlegroups.com, Push
@vadz pushed 12 commits.
- 92bbcac Always define wxMsgCatalog dtor in the library
- ede345c Fix buffer overflow when loading invalid message catalogs
- 641851d Fix buffer overflow on invalid width in wxXPMDecoder
- 8e43625 Fix data-size bound check past LIST chunk in wxSound::LoadWAV()
- b6a878b Avoid buffer read overflow in wxCharTypeBuffer ctor
- 67db441 Make recently added wxXPMDecoder test case really pass
- a5b6530 Fix buffer overflow in deepCopyHostent() name copy
- 61306e3 Fix integer overflow in tar extended header bounds check
- 5a63b83 Fix out-of-bounds read on trailing % in wxFileType::ExpandCommand()
- e4c9bd2 Validate decoded pixel indices in wxGIFDecoder::ConvertToImage()
- 9ba8604 Avoid writing beyond the buffer end for GIFs with zero size
- bbad840 Fix buffer overflow in wxVsnprintf() when size==0
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
May 31, 2026, 11:32:11 AM (3 days ago) May 31
to wx-...@googlegroups.com, Push
@vadz pushed 11 commits.
- 4864782 Fix buffer overflow when loading invalid message catalogs
- f77f70b Fix buffer overflow on invalid width in wxXPMDecoder
- 0d53937 Fix data-size bound check past LIST chunk in wxSound::LoadWAV()
- 3c5d06a Avoid buffer read overflow in wxCharTypeBuffer ctor
- fb27b95 Make recently added wxXPMDecoder test case really pass
- 6d3adaa Fix buffer overflow in deepCopyHostent() name copy
- 4e16368 Fix integer overflow in tar extended header bounds check
- 6c8aa96 Fix out-of-bounds read on trailing % in wxFileType::ExpandCommand()
- 6588d8d Validate decoded pixel indices in wxGIFDecoder::ConvertToImage()
- 2ed018e Avoid writing beyond the buffer end for GIFs with zero size
- a874715 Fix buffer overflow in wxVsnprintf() when size==0
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
May 31, 2026, 2:05:15 PM (3 days ago) May 31
to wx-...@googlegroups.com, Push
@vadz pushed 7 commits.
- 15b402e Make recently added wxXPMDecoder test case really pass
- a1cac3c Fix buffer overflow in deepCopyHostent() name copy
- 9c94b43 Fix integer overflow in tar extended header bounds check
- a3b244b Fix out-of-bounds read on trailing % in wxFileType::ExpandCommand()
- bb347b7 Validate decoded pixel indices in wxGIFDecoder::ConvertToImage()
- 741fdc7 Avoid writing beyond the buffer end for GIFs with zero size
- 87078e9 Fix buffer overflow in wxVsnprintf() when size==0
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
Jun 1, 2026, 8:13:02 AM (2 days ago) Jun 1
to wx-...@googlegroups.com, Subscribed
Merged #26447 into 3.2.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Reply all
Reply to author
Forward
0 new messages