author | jcoomes |
Sun, 11 Oct 2009 16:19:25 -0700 | |
changeset 5402 | c51fd0c1d005 |
parent 2122 | 6e2cad7ee1f5 |
child 5547 | f4b087cbb361 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
2 |
* Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. |
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
|
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
|
20 |
* CA 95054 USA or visit www.sun.com if you need additional information or |
|
21 |
* have any questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
# include "incls/_precompiled.incl" |
|
25 |
# include "incls/_growableArray.cpp.incl" |
|
26 |
||
27 |
#ifdef ASSERT |
|
28 |
void GenericGrowableArray::set_nesting() { |
|
29 |
if (on_stack()) { |
|
30 |
_nesting = Thread::current()->resource_area()->nesting(); |
|
31 |
} |
|
32 |
} |
|
33 |
||
34 |
void GenericGrowableArray::check_nesting() { |
|
35 |
// Check for insidious allocation bug: if a GrowableArray overflows, the |
|
36 |
// grown array must be allocated under the same ResourceMark as the original. |
|
37 |
// Otherwise, the _data array will be deallocated too early. |
|
38 |
if (on_stack() && |
|
39 |
_nesting != Thread::current()->resource_area()->nesting()) { |
|
40 |
fatal("allocation bug: GrowableArray could grow within nested ResourceMark"); |
|
41 |
} |
|
42 |
} |
|
43 |
#endif |
|
44 |
||
45 |
void* GenericGrowableArray::raw_allocate(int elementSize) { |
|
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
46 |
assert(_max >= 0, "integer overflow"); |
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
47 |
size_t byte_size = elementSize * (size_t) _max; |
1 | 48 |
if (on_stack()) { |
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
49 |
return (void*)resource_allocate_bytes(byte_size); |
1 | 50 |
} else if (on_C_heap()) { |
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
51 |
return (void*)AllocateHeap(byte_size, "GrET in " __FILE__); |
1 | 52 |
} else { |
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
53 |
return _arena->Amalloc(byte_size); |
1 | 54 |
} |
55 |
} |