Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong step size in wxImage::Paste()

Browse Source 
Fix a bug with wrong size passed to memset() introduced in 1f0ade29f0
(Fix using mask colour even if there is no mask in wxImage::Paste,
2020-09-30) which caused memory corruption and add a test (the one with
the large negative vertical offset) allowing to reproduce this reliably.

Closes https://github.com/wxWidgets/wxWidgets/pull/2067
This commit is contained in:
Eric Raijmakers
2020-10-01 19:27:28 +02:00
committed by Vadim Zeitlin
parent 0c3494592a
commit ec8bfbebdc
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/image.cpp
View File

@@ -1764,7 +1764,7 @@ wxImage::Paste(const wxImage & image, int x, int y,
// Make all the copied pixels fully opaque // Make all the copied pixels fully opaque
if (alpha_target_data != NULL) if (alpha_target_data != NULL)
{ {
memset(alpha_target_data, wxALPHA_OPAQUE, target_alpha_step); memset(alpha_target_data, wxALPHA_OPAQUE, width);
alpha_target_data += target_alpha_step; alpha_target_data += target_alpha_step;
} }
} }

15
tests/image/image.cpp
View File

@@ -1839,6 +1839,21 @@ TEST_CASE("wxImage::Paste", "[image][paste]")
CHECK_THAT(actual, CenterAlphaPixelEquals(255)); CHECK_THAT(actual, CenterAlphaPixelEquals(255));
CHECK_THAT(actual, RGBSameAs(black)); CHECK_THAT(actual, RGBSameAs(black));
} }
SECTION("Paste large image with negative vertical offset")
{
wxImage target(442, 249);
wxImage to_be_pasted(345, 24900);
target.InitAlpha();
target.Paste(to_be_pasted, 48, -12325, wxIMAGE_ALPHA_BLEND_COMPOSE);
}
SECTION("Paste large image with negative horizontal offset")
{
wxImage target(249, 442);
wxImage to_be_pasted(24900, 345);
target.InitAlpha();
target.Paste(to_be_pasted, -12325, 48, wxIMAGE_ALPHA_BLEND_COMPOSE);
}
} }
/* /*