Mercurial > hg > icedtea9-forest > jdk
changeset 5569:5e8caf6984f5
7166955: (pack200) JNI_GetCreatedJavaVMs needs additional checking
Reviewed-by: alanb, dholmes, ksrini
Contributed-by: youdwei@linux.vnet.ibm.com
| author | ksrini |
|---|---|
| date | Wed, 09 May 2012 07:28:12 -0700 |
| parents | abb63b7357a1 |
| children | 59121a4c71c6 |
| files | src/share/native/com/sun/java/util/jar/pack/jni.cpp |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/com/sun/java/util/jar/pack/jni.cpp Wed May 09 11:19:54 2012 +0800 +++ b/src/share/native/com/sun/java/util/jar/pack/jni.cpp Wed May 09 07:28:12 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -82,7 +82,11 @@ static unpacker* get_unpacker() { //fprintf(stderr, "get_unpacker()\n"); JavaVM* vm = null; - JNI_GetCreatedJavaVMs(&vm, 1, null); + jsize nVM = 0; + jint retval = JNI_GetCreatedJavaVMs(&vm, 1, &nVM); + // other VM implements may differ, thus for correctness, we need these checks + if (retval != JNI_OK || nVM != 1) + return null; void* envRaw = null; vm->GetEnv(&envRaw, JNI_VERSION_1_1); JNIEnv* env = (JNIEnv*) envRaw;