Mercurial > hg > release > icedtea6-1.8
view patches/security/20111018/7077466.patch @ 2161:7524f507af5c
Apply latest security patches.
2011-10-17 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am: Add patches.
* NEWS: List security updates.
* patches/icedtea-rhino.patch: Change after 7046823 is applied.
* patches/icedtea-xjc.patch: Update against 7046794.
* patches/security/20111018/7000600.patch,
* patches/security/20111018/7019773.patch,
* patches/security/20111018/7023640.patch,
* patches/security/20111018/7032417.patch,
* patches/security/20111018/7046823.patch,
* patches/security/20111018/7055902.patch,
* patches/security/20111018/7057857.patch,
* patches/security/20111018/7064341.patch,
* patches/security/20111018/7083012.patch,
* patches/security/20111018/7096936.patch,
* patches/security/20111018/7046794.patch,
* patches/security/20111018/7077466.patch:
Add security patches.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Mon, 17 Oct 2011 15:40:23 +0100 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User coffeys # Date 1316425951 -3600 # Node ID 92ab8bb7ff22127aa61442019bd53f3eb19166d3 # Parent ce3948d7981089ddc960d1191b3fa8ff32ccf165 7077466: fix for RMI DGC Reviewed-by: smarks diff --git a/src/share/classes/sun/rmi/server/UnicastServerRef.java b/src/share/classes/sun/rmi/server/UnicastServerRef.java --- openjdk/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java +++ openjdk/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java @@ -390,6 +390,12 @@ public class UnicastServerRef extends Un ObjectInput in; try { in = call.getInputStream(); + try { + Class<?> clazz = Class.forName("sun.rmi.transport.DGCImpl_Skel"); + if (clazz.isAssignableFrom(skel.getClass())) { + ((MarshalInputStream)in).useCodebaseOnly(); + } + } catch (ClassNotFoundException ignore) { } hash = in.readLong(); } catch (Exception readEx) { throw new UnmarshalException("error unmarshalling call header",