Skip to content

[Win32] Ensure Image#getImageData() returns no internal data #2427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2025
+30 −4
Merged

[Win32] Ensure Image#getImageData() returns no internal data #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,7 +2017,7 @@ ImageData newImageData(ZoomContext zoomContext) {
handle.destroy();
return data;
};
return cachedImageData.computeIfAbsent(zoomContext.targetZoom(), imageDataRetrieval);
return (ImageData) cachedImageData.computeIfAbsent(zoomContext.targetZoom(), imageDataRetrieval).clone();
}

@Override
Expand Down Expand Up @@ -2297,7 +2297,7 @@ ImageData newImageData(ZoomContext zoomContext) {
handle.destroy();
return data;
};
return cachedImageData.computeIfAbsent(zoomContext.targetZoom(), imageDataRetrival);
return (ImageData) cachedImageData.computeIfAbsent(zoomContext.targetZoom(), imageDataRetrival).clone();
}


Expand Down
30 changes: 28 additions & 2 deletions ...wt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
Expand All @@ -33,6 +32,8 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;

import org.eclipse.swt.SWT;
Expand Down Expand Up @@ -683,6 +684,25 @@ public void test_getImageData() {
getImageData2(32, new PaletteData(0xff0000, 0xff00, 0xff));
}

@Test
public void test_getImageData_changingImageDataDoesNotAffectImage() {
List<Image> images = List.of( //
new Image(display, imageFileNameProvider), //
new Image(display, imageDataProvider), //
new Image(display, new ImageData(10, 10, 32, new PaletteData(0xff0000, 0xff00, 0xff))) //
);

try {
for (Image image : images) {
ImageData originalImageData = image.getImageData();
originalImageData.setPixel(0, 0, originalImageData.getPixel(0, 0) + 1);
assertNotEquals(image.getImageData().getPixel(0, 0), originalImageData.getPixel(0, 0));
}
} finally {
images.forEach(Image::dispose);
}
}

@Test
public void test_getImageData_100() {
getImageData_int(100);
Expand Down Expand Up @@ -1032,11 +1052,17 @@ public void test_updateWidthHeightAfterDPIChange() {
public void test_imageDataIsCached() {
assumeTrue("On-demand image creation only implemented for Windows", SwtTestUtil.isWindows);
String imagePath = getPath("collapseall.png");
AtomicInteger callCount = new AtomicInteger();
ImageFileNameProvider imageFileNameProvider = __ -> {
callCount.incrementAndGet();
return imagePath;
};
Image fileNameProviderImage = new Image(display, imageFileNameProvider);
assertSame(fileNameProviderImage.getImageData(100), fileNameProviderImage.getImageData(100));
callCount.set(0);
fileNameProviderImage.getImageData(100);
fileNameProviderImage.getImageData(100);
fileNameProviderImage.getImageData(100);
assertEquals(0, callCount.get());
}

@Test
Expand Down
Loading