Skip to content

Commit 1ef9010

Browse files
committed
new fix for NPE #12
1 parent 97656d7 commit 1ef9010

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/pxb/android/StringItems.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ public void prepare() throws IOException {
106106
item.dataOffset = offset;
107107
map.put(stringData, offset);
108108
if (useUTF8) {
109-
int length = stringData.length();
110-
byte[] data = stringData.getBytes("UTF-8");
109+
int length = stringData == null ? 0 : stringData.length();
110+
byte[] data = stringData == null ? new byte[0] : stringData.getBytes("UTF-8");
111111
int u8lenght = data.length;
112112

113113
if (length > 0x7F) {
@@ -125,8 +125,8 @@ public void prepare() throws IOException {
125125
baos.write(0);
126126
offset += 3 + u8lenght;
127127
} else {
128-
int length = stringData.length();
129-
byte[] data = stringData.getBytes("UTF-16LE");
128+
int length = stringData == null ? 0 :stringData.length();
129+
byte[] data = stringData == null ? new byte[0] : stringData.getBytes("UTF-16LE");
130130
if (length > 0x7FFF) {
131131
int x = (length >> 16) | 0x8000;
132132
baos.write(x);

0 commit comments

Comments
 (0)