infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

7029832: Buffer overrun at awt_LoadLibrary.c (and java_props_md.c)

Browse Source 
Reviewed-by: anthony, art
This commit is contained in:
Andrei Dmitriev 2011-04-08 18:29:27 +04:00
parent 8ca505ebed
commit f9feed6668
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
View File

@ -128,12 +128,12 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
}
}
/* Calculate toolkit name, kind of toolkit (XAWT, Motif) and library to load */
/* Calculate library name to load */
if (AWTIsHeadless()) {
strcpy(p, "/headless/libmawt");
strncpy(p, "/headless/libmawt.so", MAXPATHLEN-len-1);
} else {
/* Default AWT Toolkit on Linux and Solaris is XAWT. */
strcpy(p, "/xawt/libmawt");
strncpy(p, "/xawt/libmawt.so", MAXPATHLEN-len-1);
}
if (toolkit) {
@ -143,23 +143,12 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
(*env)->DeleteLocalRef(env, propname);
}
strcat(p, ".so");
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
JNU_NewStringPlatform(env, buf));
awtHandle = dlopen(buf, RTLD_LAZY | RTLD_GLOBAL);
/*
if (dlsym(awtHandle, "AWTCharRBearing") == NULL) {
printf("========= AWTCharRBearing not found\n"); fflush(stdout);
}
else {
printf("========= AWTCharRBearing was found\n"); fflush(stdout);
}
*/
return JNI_VERSION_1_2;
}