archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8189977: Improve permission portability

Browse source 
Reviewed-by: rriggs
This commit is contained in:
Weijun Wang 2017-12-06 21:17:19 +08:00
parent a7c9c021ba
commit 0b873290a4
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/util/Hashtable.java
View file

@ -1293,6 +1293,10 @@ public class Hashtable<K,V>
length--;
length = Math.min(length, origlength);
if (length < 0) { // overflow
length = origlength;
}
// Check Map.Entry[].class since it's the nearest public type to
// what we're actually creating.
SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, length);

26
src/java.base/share/classes/java/util/Vector.java
View file

@ -25,6 +25,9 @@
package java.util;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.StreamCorruptedException;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
@ -1168,6 +1171,29 @@ public class Vector<E>
es[i] = null;
}
/**
* Loads a {@code Vector} instance from a stream
* (that is, deserializes it).
* This method performs checks to ensure the consistency
* of the fields.
*
* @param in the stream
* @throws java.io.IOException if an I/O error occurs
* @throws ClassNotFoundException if the stream contains data
* of a non-existing class
*/
private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField gfields = in.readFields();
int count = gfields.get("elementCount", 0);
Object[] data = (Object[])gfields.get("elementData", null);
if (count < 0 || data == null || count > data.length) {
throw new StreamCorruptedException("Inconsistent vector internals");
}
elementCount = count;
elementData = data.clone();
}
/**
* Saves the state of the {@code Vector} instance to a stream
* (that is, serializes it).