Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Majano2022-02-03 18:13:35 +0000
committerAlexander Kurtakov2022-02-04 06:07:05 +0000
commit1a408f0b8407fac42e133fbb7784a17cdfff8621 (patch)
treedfac4654347897b6145824dec9639dc4b07a0a08
parent24ca055123a22e339adc159c9100edacf4e36b2e (diff)
downloadeclipse.platform.swt-1a408f0b8407fac42e133fbb7784a17cdfff8621.tar.gz
eclipse.platform.swt-1a408f0b8407fac42e133fbb7784a17cdfff8621.tar.xz
eclipse.platform.swt-1a408f0b8407fac42e133fbb7784a17cdfff8621.zip
Bug 576484 - GError not freed
Previous patch has a leak if g_error_matches fails. Now error is freed in any case. Change-Id: I9a332cd66b2f7ae8925be4c72deda4d936a936e0 Signed-off-by: Joel Majano <jmajano@redhat.com> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/190383 Reviewed-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com> Tested-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java
index 1080d57450..edd343e2e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java
@@ -205,6 +205,8 @@ ImageData [] getImageDataArrayFromStream(InputStream stream) {
*/
if(OS.g_error_matches(error[0], OS.g_file_error_quark(), OS.G_FILE_ERROR_IO)){
SWT.error(SWT.ERROR_IO, null, Display.extractFreeGError(error[0]));
+ } else {
+ OS.g_error_free(error[0]);
}
}
GDK.gdk_pixbuf_loader_close(loader, null);

Back to the top