archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6726963: multi_allocate() call does not CHECK_NULL and causes crash in fastdebug bits

Browse source 
Using CHECK_NULL when calling multi_allocate() from the corresponding reflection code; added test for this condition

Reviewed-by: dholmes, minqi
This commit is contained in:
Mikhailo Seledtsov 2013-05-31 20:24:58 +02:00 • committed by Christian Tornqvist
parent 6d51346158
commit 6a7e90e362
2 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/runtime/reflection.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2013, 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
@ -375,7 +375,7 @@ arrayOop Reflection::reflect_new_multi_array(oop element_mirror, typeArrayOop di
} }
} }
klass = klass->array_klass(dim, CHECK_NULL); klass = klass->array_klass(dim, CHECK_NULL);
oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, THREAD); oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, CHECK_NULL);
assert(obj->is_array(), "just checking"); assert(obj->is_array(), "just checking");
return arrayOop(obj); return arrayOop(obj);
} }

45
hotspot/test/runtime/memory/MultiAllocateNullCheck.java Normal file
View file

@ -0,0 +1,45 @@
/*
* Copyright (c) 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test MultiAllocateNullCheck
* @bug 6726963
* @summary multi_allocate() call does not CHECK_NULL and causes crash in fastdebug bits
* @run main/othervm -Xmx32m MultiAllocateNullCheck
*/
import java.lang.reflect.Array;
public class MultiAllocateNullCheck {
public static void main(String[] args) throws Exception {
Object x = null;
try
{
x = Array.newInstance(String.class, new int[]
{Integer.MAX_VALUE, Integer.MAX_VALUE});
System.out.println("Array was created");
} catch (OutOfMemoryError e) {
System.out.println("Out of memory occured, which is OK in this case");
}
}
}