eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

classlib: fix NPE when passing null to Arrays.toString (#667)

Browse Source
This commit is contained in:
Ivan Hetman 2023-02-28 10:46:59 +02:00 committed by GitHub
parent 971fa9a1f3
commit 07d56f1b0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
classlib/src/main/java/org/teavm/classlib/java/util/TArrays.java
View File

@ -217,6 +217,9 @@ public class TArrays extends TObject {
} }
public static String toString(TObject[] a) { public static String toString(TObject[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -230,6 +233,9 @@ public class TArrays extends TObject {
} }
public static String toString(boolean[] a) { public static String toString(boolean[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -243,6 +249,9 @@ public class TArrays extends TObject {
} }
public static String toString(byte[] a) { public static String toString(byte[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -256,6 +265,9 @@ public class TArrays extends TObject {
} }
public static String toString(short[] a) { public static String toString(short[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -269,6 +281,9 @@ public class TArrays extends TObject {
} }
public static String toString(char[] a) { public static String toString(char[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -282,6 +297,9 @@ public class TArrays extends TObject {
} }
public static String toString(int[] a) { public static String toString(int[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -295,6 +313,9 @@ public class TArrays extends TObject {
} }
public static String toString(long[] a) { public static String toString(long[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -308,6 +329,9 @@ public class TArrays extends TObject {
} }
public static String toString(float[] a) { public static String toString(float[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -321,6 +345,9 @@ public class TArrays extends TObject {
} }
public static String toString(double[] a) { public static String toString(double[] a) {
if (a == null) {
return "null";
}
TStringBuilder sb = new TStringBuilder(); TStringBuilder sb = new TStringBuilder();
sb.append("["); sb.append("[");
for (int i = 0; i < a.length; ++i) { for (int i = 0; i < a.length; ++i) {
@ -1552,6 +1579,9 @@ public class TArrays extends TObject {
} }
public static String deepToString(Object[] a) { public static String deepToString(Object[] a) {
if (a == null) {
return "null";
}
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
deepToString(a, sb, new TArrayList<>()); deepToString(a, sb, new TArrayList<>());
return sb.toString(); return sb.toString();