[9] RFR(S): 8139150: ClassVerifier frees exception message while it's still in use (original) (raw)
Tobias Hartmann tobias.hartmann at oracle.com
Fri Oct 9 07:11:10 UTC 2015
- Previous message: [9] RFR(S): 8139150: ClassVerifier frees exception message while it's still in use
- Next message: RFR (XXS): 8138820: JDK Hotspot build fails with Xcode 7.0.1
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi Daniel,
On 08.10.2015 18:08, Daniel D. Daugherty wrote:
On 10/8/15 9:38 AM, Tobias Hartmann wrote:
Hi,
please review the following patch. https://bugs.openjdk.java.net/browse/JDK-8139150 http://cr.openjdk.java.net/~thartmann/8139150/webrev.00/ src/share/vm/classfile/stackMapTable.cpp No comments. Thumbs up! Did a quick audit and I don't see any other calls to classformaterror() with the same issue. This bug is very old. That ResourceMark came from here: $ sp -r1.17 src/share/vm/classfile/stackMapTable.cpp src/share/vm/classfile/SCCS/s.stackMapTable.cpp: D 1.17 05/06/20 17:21:50 mingyao 18 17 00015/00008/00446 MRs: COMMENTS: Fixed 6275215, VM fails on StackMapTable jcod tests (VerifyError) Fixed 6275199, VM fails on StackMapTable jcod tests Fixed 6275153, VM fails on StackMapTable tests And the code looked like this: 187a185,194 if (offset >= codelength || codedata[offset] != ClassVerifier::NEWOFFSET) { ResourceMark rm(THREAD); Exceptions::fthrow( THREADANDLOCATION, vmSymbolHandles::javalangClassFormatError(), "StackMapTable format error: bad offset for Uninitialized" ); return NULL; } The classformaterror() call came from here: D 1.21 06/04/13 11:43:50 km88527 23 22 00064/00108/00360 MRs: COMMENTS: fixed 6402717: Error verifying java.lang.Error causes VM to exit silently due to stack overflow and the code changed to look like this: if (offset >= codelength || codedata[offset] != ClassVerifier::NEWOFFSET) { ResourceMark rm(THREAD); verifier->classformaterror( "StackMapTable format error: bad offset for Uninitialized"); return NULL; }
Thanks for tracking this down. Seems like the old fix forgot to remove the ResourceMark and for some reason this never showed up.
This fix should probably be backported... but I would check with Harold...
Yes, I think so too.
Thanks, Tobias
Dan
Problem: If class verification fails in StackMapReader::parseverificationtype(), ClassVerifier::classformaterror() is invoked to pass the error message. The method allocates a new string and saves it in ClassVerifier::message. The problem is that the caller creates a new ResourceMark that leads to message being deallocated after return. However, later in Verifier::verify() we call ClassVerifier::exceptionmessage() to get the message and pass it on. Solution: We should not create a ResourceMark here. There is a top level ResourceMark in Verifier::verify() that will take care of freeing the memory allocated in ClassVerifier::classformaterror(). Tested with JPRT and the failing testcase. Thanks, Tobias
- Previous message: [9] RFR(S): 8139150: ClassVerifier frees exception message while it's still in use
- Next message: RFR (XXS): 8138820: JDK Hotspot build fails with Xcode 7.0.1
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]