diff options
Diffstat (limited to 'java/openjdk6/files/icedtea/security/20130201/7201070.patch')
-rw-r--r-- | java/openjdk6/files/icedtea/security/20130201/7201070.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/java/openjdk6/files/icedtea/security/20130201/7201070.patch b/java/openjdk6/files/icedtea/security/20130201/7201070.patch deleted file mode 100644 index 77df21d28374..000000000000 --- a/java/openjdk6/files/icedtea/security/20130201/7201070.patch +++ /dev/null @@ -1,31 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1355322673 0 -# Node ID 042882b32f75d0e736c19f93688d37fb98d7d26d -# Parent 708c134c36312faf8721c0c981be6553e4ebf49f -7201070: Serialization to conform to protocol -Reviewed-by: smarks, skoivu - -diff --git a/src/share/classes/java/io/ObjectInputStream.java b/src/share/classes/java/io/ObjectInputStream.java ---- jdk/src/share/classes/java/io/ObjectInputStream.java -+++ jdk/src/share/classes/java/io/ObjectInputStream.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 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 -@@ -1749,6 +1749,12 @@ public class ObjectInputStream - ObjectStreamClass desc = readClassDesc(false); - desc.checkDeserialize(); - -+ Class<?> cl = desc.forClass(); -+ if (cl == String.class || cl == Class.class -+ || cl == ObjectStreamClass.class) { -+ throw new InvalidClassException("invalid class descriptor"); -+ } -+ - Object obj; - try { - obj = desc.isInstantiable() ? desc.newInstance() : null; |