OpenJDK / amber / amber
changeset 4807:2521b7dcf505
6862064: incorrect implementation of PKIXParameters.clone()
Reviewed-by: weijun, mullan
| author | xuelei |
|---|---|
| date | Wed, 20 Jan 2010 21:38:37 +0800 |
| parents | 2aebbe5c08a7 |
| children | 37f605425f74 |
| files | jdk/src/share/classes/java/security/cert/PKIXParameters.java |
| diffstat | 1 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/java/security/cert/PKIXParameters.java Tue Jan 19 11:43:45 2010 +0800 +++ b/jdk/src/share/classes/java/security/cert/PKIXParameters.java Wed Jan 20 21:38:37 2010 +0800 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2000-2009 Sun Microsystems, Inc. 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 @@ -663,15 +663,23 @@ */ public Object clone() { try { - Object copy = super.clone(); - // Must clone these because addCertStore, et al. modify them + PKIXParameters copy = (PKIXParameters)super.clone(); + + // must clone these because addCertStore, et al. modify them if (certStores != null) { - certStores = new ArrayList<CertStore>(certStores); + copy.certStores = new ArrayList<CertStore>(certStores); } if (certPathCheckers != null) { - certPathCheckers = - new ArrayList<PKIXCertPathChecker>(certPathCheckers); + copy.certPathCheckers = + new ArrayList<PKIXCertPathChecker>(certPathCheckers.size()); + for (PKIXCertPathChecker checker : certPathCheckers) { + copy.certPathCheckers.add( + (PKIXCertPathChecker)checker.clone()); + } } + + // other class fields are immutable to public, don't bother + // to clone the read-only fields. return copy; } catch (CloneNotSupportedException e) { /* Cannot happen */