Skip to content

Commit

Permalink
Allow Array.set(objArray, index, null) to not throw NPE.
Browse files Browse the repository at this point in the history
Fixes oracle#1585

Avoid checking assignability of the value to the array
element type if the value is null, and therefore `.getClass()`
is pretty much guaranteed to throw an NPE.

(cherry picked from commit 28ff8a1)
  • Loading branch information
Bob McWhirter authored and gilles-duboscq committed Aug 8, 2019
1 parent 856c93d commit 8a9fb51
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,10 @@ private static void set(Object array, int index, Object value) {
return;
}
} else if (array instanceof Object[]) {
if (array.getClass().getComponentType().isAssignableFrom(value.getClass())) {
if (value == null) {
((Object[]) array)[index] = null;
return;
} else if (array.getClass().getComponentType().isAssignableFrom(value.getClass())) {
((Object[]) array)[index] = value;
return;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* Copyright (c) 2019, 2019, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package com.oracle.svm.test;

// Checkstyle: off
import java.lang.reflect.Array;

import org.junit.Assert;
import org.junit.Test;

public class ArraySetTest {

@Test
public void testObjectArraySetWithNull() {
String[] array = new String[]{
"a",
"b",
"c",
"d"
};

Array.set(array, 0, null);

Assert.assertNull(array[0]);
Assert.assertEquals("b", array[1]);
Assert.assertEquals("c", array[2]);
Assert.assertEquals("d", array[3]);
}

}

0 comments on commit 8a9fb51

Please sign in to comment.