Skip to content

8365609: Fix several potential NULL native pointer dereferences in the desktop module #26799

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
wants to merge 11 commits into
base: master
Choose a base branch
from
+4 −5
Open

8365609: Fix several potential NULL native pointer dereferences in the desktop module #26799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ff9825c
8365609 Null pointer dereference in src/java.desktop/share/native/com…
savoptik Jun 18, 2025
c4b8712
The same issue is present in src/java.desktop/share/native/common/jav…
savoptik Jun 18, 2025
e74b2bc
The same issue is present in src/java.desktop/share/native/libsplashs…
savoptik Jun 18, 2025
a369e3a
The same issue is present in src/java.desktop/unix/native/libawt_xawt…
savoptik Aug 4, 2025
92ab60e
Revert "The same issue is present in src/java.desktop/unix/native/lib…
savoptik Aug 25, 2025
a730765
Updated fix fore src/java.desktop/unix/native/libawt_xawt/awt/gtk3_in…
savoptik Aug 25, 2025
f0a276f
Update src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
savoptik Aug 28, 2025
c96d09a
Fixed indentation
savoptik Aug 28, 2025
761afd3
Revert "Fixed indentation"
savoptik Sep 1, 2025
cf92998
Revert "8365609 Null pointer dereference in src/java.desktop/share/na…
savoptik Sep 1, 2025
1a5a401
Revert "The same issue is present in src/java.desktop/share/native/co…
savoptik Sep 1, 2025
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: 3 additions & 1 deletion src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,9 @@ SplashDecodeGif(Splash * splash, GifFileType * gif)
ImageRect dstRect;
rgbquad_t fillColor = 0; // 0 is transparent

if (transparentColor < 0) {
if (colorMap &&
colorMap->Colors &&
transparentColor < 0) {
fillColor= MAKE_QUAD_GIF(
colorMap->Colors[gif->SBackGroundColor], 0xff);
Comment on lines +283 to 286
Copy link
Contributor

Choose a reason for hiding this comment

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

Dont we need to check for colorMap->Colors here too

jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c

Line 208 in c96d09a

colorMapBuf[i] = MAKE_QUAD_GIF(colorMap->Colors[i], 0xff);

Copy link
Contributor

Choose a reason for hiding this comment

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

The problem isn't the Colors member, it is colorMap. I'm not sure the new check for Colors is necessary.
If you look at giflib's allocator for this it will never return a colorMap without Colors allocated and the giflib code itself assumes that this is true.

}
Expand Down
5 changes: 1 addition & 4 deletions src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,7 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
fp_gtk_check_version = dl_symbol("gtk_check_version");

/* GLib */
fp_glib_check_version = dlsym(gtk3_libhandle, "glib_check_version");
if (!fp_glib_check_version) {
dlerror();
}
fp_glib_check_version = dl_symbol("glib_check_version");
fp_g_free = dl_symbol("g_free");
fp_g_object_unref = dl_symbol("g_object_unref");

Expand Down