open-maui/OpenMaui
2
0
Fork 0
Code Issues Releases 1

fix(interop): resolve native resource leaks in GTK and WebKit interop
All checks were successful
CI / Build (Linux) (push) Successful in 21s
Details

Browse Source 
Fix critical memory leaks identified in architecture review: Add signal handler disconnection in WebKitNative (load-changed and script-dialog signals now properly cleaned up), implement GTK idle callback cleanup with automatic removal on completion, add dlclose() calls for WebKit library handles, track GTK signal IDs in GtkSkiaSurfaceWidget for proper disposal. Replace empty catch blocks in GestureManager with logged exception handling. Add WebKitNative.Cleanup() and GtkNative.ClearCallbacks() methods for application shutdown.
This commit is contained in:
David H. Friedel Jr.
2026-03-06 23:14:53 -05:00
parent c5221ba580
commit 3412cb982e
22 changed files with 1208 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Views/SkiaShell.cs
View File

@@ -646,7 +646,7 @@ public class SkiaShell : SkiaLayoutView
var value = Convert.ChangeType(param.Value, prop.PropertyType);
prop.SetValue(content, value);
}
catch { }
catch (Exception ex) { DiagnosticLog.Debug("SkiaShell", "Parameter type conversion failed", ex); }
}
}
}

10
Views/SkiaWebView.cs
View File

@@ -1083,7 +1083,7 @@ public class SkiaWebView : SkiaView
var root = XDefaultRootWindow(_mainDisplay);
XTranslateCoordinates(_mainDisplay, _mainWindow, root, 0, 0, out destX, out destY, out _);
}
catch { }
catch (Exception ex) { DiagnosticLog.Debug("SkiaWebView", "X11 coordinate translation failed", ex); }
int x = destX + (int)Bounds.Left;
int y = destY + (int)Bounds.Top;
@@ -1113,7 +1113,7 @@ public class SkiaWebView : SkiaView
IntPtr[] data = { wmStateAbove };
XChangeProperty(_mainDisplay, window, wmState, atomType, 32, 0, data, 1);
}
catch { }
catch (Exception ex) { DiagnosticLog.Debug("SkiaWebView", "Window state change failed", ex); }
}
private void EnableOverlayMode()
@@ -1174,7 +1174,7 @@ public class SkiaWebView : SkiaView
var root = XDefaultRootWindow(_mainDisplay);
XTranslateCoordinates(_mainDisplay, _mainWindow, root, 0, 0, out destX, out destY, out _);
}
catch { }
catch (Exception ex) { DiagnosticLog.Debug("SkiaWebView", "X11 coordinate translation failed", ex); }
// Track main window position changes
bool mainWindowMoved = destX != _lastMainX || destY != _lastMainY;
@@ -1242,7 +1242,7 @@ public class SkiaWebView : SkiaView
if (surface != IntPtr.Zero)
{
try { return gdk4_x11_surface_get_xid(surface); }
catch { }
catch (Exception ex) { DiagnosticLog.Debug("SkiaWebView", "GTK4 XID lookup failed", ex); }
}
}
else
@@ -1251,7 +1251,7 @@ public class SkiaWebView : SkiaView
if (gdkWindow != IntPtr.Zero)
{
try { return gdk3_x11_window_get_xid(gdkWindow); }
catch { }
catch (Exception ex) { DiagnosticLog.Debug("SkiaWebView", "GTK3 XID lookup failed", ex); }
}
}