Skip to content

Use soname in WPEWebkit availability check #30

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

Open
shatyuka wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use soname in WPEWebkit availability check #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f26312d
Use soname in WPEWebkit availability check
shatyuka Apr 17, 2026
cc45ebf
Fix use after free
shatyuka Apr 17, 2026
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
16 changes: 3 additions & 13 deletions src/Avalonia.Controls.WebView.Core/Linux/WpeWebViewAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,13 @@ private static bool CheckAvailability()
return false;
}

if (!NativeLibrary.TryLoad("libWPEWebKit-2.0.so", out var webkitHandle))
if (!NativeLibrary.TryLoad("libWPEWebKit-2.0.so.1", out _))
return false;
if (!NativeLibrary.TryLoad("libWPEBackend-fdo-1.0.so", out var fdoHandle))
{
NativeLibrary.Free(webkitHandle);
if (!NativeLibrary.TryLoad("libWPEBackend-fdo-1.0.so.1", out _))
return false;
}
if (!NativeLibrary.TryLoad("libwpe-1.0.so", out var wpeHandle))
{
NativeLibrary.Free(fdoHandle);
NativeLibrary.Free(webkitHandle);
if (!NativeLibrary.TryLoad("libwpe-1.0.so.1", out _))
return false;
Comment on lines +104 to 109

@shatyuka shatyuka May 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unloading a module is always troublesome, and it's almost never the case that these three modules don't coexist.

}

NativeLibrary.Free(wpeHandle);
NativeLibrary.Free(fdoHandle);
NativeLibrary.Free(webkitHandle);
return true;
}

Expand Down