infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-10 02:18:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

8059590: ArrayIndexOutOfBoundsException occurs when Container with overridden getComponents() is deserialized

Browse Source 
Reviewed-by: serb, ant
This commit is contained in:
Alexey Ivanov 2014-10-20 12:36:16 +04:00
parent 98988ffc54
commit 13fbfe1e6c
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.desktop/share/classes/java/awt/Container.java
View File

@ -3696,7 +3696,7 @@ public class Container extends Component {
private void writeObject(ObjectOutputStream s) throws IOException {
ObjectOutputStream.PutField f = s.putFields();
f.put("ncomponents", component.size());
f.put("component", getComponentsSync());
f.put("component", component.toArray(EMPTY_ARRAY));
f.put("layoutMgr", layoutMgr);
f.put("dispatcher", dispatcher);
f.put("maxSize", maxSize);

74
jdk/test/java/awt/Container/ContainerAIOOBE/ContainerAIOOBE.java Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright (c) 2014, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.awt.Button;
import java.awt.Component;
import java.awt.Container;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
/**
* @test
* @bug 8059590
* @summary ArrayIndexOutOfBoundsException occurs when Container with overridden getComponents() is deserialized.
* @author Alexey Ivanov
* @run main ContainerAIOOBE
*/
public class ContainerAIOOBE {
public static void main(final String[] args) throws Exception {
ZContainer z = new ZContainer();
z.add(new Button());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(z);
oos.flush();
oos.close();
byte[] array = baos.toByteArray();
ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(array));
// Reading the object must not throw ArrayIndexOutOfBoundsException
ZContainer zz = (ZContainer) ois.readObject();
if (zz.getComponentCount() != 1) {
throw new Exception("deserialized object must have 1 component");
}
if (!(zz.getComponent(0) instanceof Button)) {
throw new Exception("deserialized object must contain Button component");
}
if (zz.getComponents().length != 0) {
throw new Exception("deserialized object returns non-empty array");
}
System.out.println("Test passed");
}
static class ZContainer extends Container {
public Component[] getComponents() {
return new Component[0];
}
}
}