stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8161225: Assert failure in JVMTI GetNamedModule at JPLISAgent.c line: 792

Browse Source 
Made the assert less restrictive.

Reviewed-by: dholmes, dcubed, sspitsyn
This commit is contained in:
Chris Plummer 2016-09-21 12:53:07 -07:00
parent 89744d775f
commit 7f563f1567
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c
View File

@ -790,9 +790,10 @@ getModuleObject(jvmtiEnv* jvmti,
pkg_name_buf[len] = '\0'; pkg_name_buf[len] = '\0';
err = (*jvmti)->GetNamedModule(jvmti, loaderObject, pkg_name_buf, &moduleObject); err = (*jvmti)->GetNamedModule(jvmti, loaderObject, pkg_name_buf, &moduleObject);
free((void*)pkg_name_buf);
check_phase_ret_blob(err, NULL);
jplis_assert_msg(err == JVMTI_ERROR_NONE, "error in the JVMTI GetNamedModule"); jplis_assert_msg(err == JVMTI_ERROR_NONE, "error in the JVMTI GetNamedModule");
free((void*)pkg_name_buf);
return moduleObject; return moduleObject;
} }

2
jdk/test/ProblemList.txt
View File

@ -134,8 +134,6 @@ java/lang/instrument/RetransformBigClass.sh 8065756 generic-
java/lang/instrument/BootClassPath/BootClassPathTest.sh 8072130 macosx-all java/lang/instrument/BootClassPath/BootClassPathTest.sh 8072130 macosx-all
java/lang/instrument/DaemonThread/TestDaemonThread.java 8161225 generic-all
java/lang/management/MemoryMXBean/Pending.java 8158837 generic-all java/lang/management/MemoryMXBean/Pending.java 8158837 generic-all
java/lang/management/MemoryMXBean/PendingAllGC.sh 8158760 generic-all java/lang/management/MemoryMXBean/PendingAllGC.sh 8158760 generic-all

3
jdk/test/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java
View File

@ -1,6 +1,6 @@
/* /*
* Copyright 2014 Goldman Sachs. * Copyright 2014 Goldman Sachs.
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -32,6 +32,7 @@ public class TestDaemonThreadLauncher {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-javaagent:DummyAgent.jar", "TestDaemonThread", "."); ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-javaagent:DummyAgent.jar", "TestDaemonThread", ".");
OutputAnalyzer analyzer = ProcessTools.executeProcess(pb); OutputAnalyzer analyzer = ProcessTools.executeProcess(pb);
analyzer.shouldNotContain("ASSERTION FAILED"); analyzer.shouldNotContain("ASSERTION FAILED");
analyzer.shouldHaveExitValue(0);
} }
} }
} }