From ba70448f808f455b35bda0d63a14c094da465484 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Wed, 22 Oct 2014 10:44:00 -0400 Subject: [PATCH] Added null checks for objects before sending bytes in SWGList --- src/resources/objects/SWGList.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/resources/objects/SWGList.java b/src/resources/objects/SWGList.java index 383394cf..9cfae8ec 100644 --- a/src/resources/objects/SWGList.java +++ b/src/resources/objects/SWGList.java @@ -407,7 +407,15 @@ public class SWGList extends Delta implements List { int size = 0; for (Object o : list) { + if (o == null) { + System.err.println("ERROR: Null object in SWGList!"); + continue; + } byte[] object = Baseline.toBytes(o); + if (object == null) { + System.err.println("ERROR: Null Baseline.toBytes in SWGList!"); + continue; + } size += object.length; IoBuffer buffer = createBuffer(size);