diff options
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java | 12 | ||||
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java | 9 |
2 files changed, 15 insertions, 6 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java b/sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java index 885be58b3..b63772071 100644 --- a/sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java +++ b/sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java @@ -1,8 +1,5 @@ package com.smartdevicelink.protocol;
-import java.io.ByteArrayOutputStream;
-import java.util.Hashtable;
-
import com.smartdevicelink.SdlConnection.SdlConnection;
import com.smartdevicelink.SdlConnection.SdlSession;
import com.smartdevicelink.exception.SdlException;
@@ -15,6 +12,9 @@ import com.smartdevicelink.security.SdlSecurityBase; import com.smartdevicelink.util.BitConverter;
import com.smartdevicelink.util.DebugTool;
+import java.io.ByteArrayOutputStream;
+import java.util.Hashtable;
+
public class WiProProtocol extends AbstractProtocol {
byte _version = 1;
private final static String FailurePropagating_Msg = "Failure propagating ";
@@ -281,6 +281,9 @@ public class WiProProtocol extends AbstractProtocol { if (_version > 1) {
BinaryFrameHeader binFrameHeader = BinaryFrameHeader.
parseBinaryHeader(accumulator.toByteArray());
+ if(binFrameHeader == null) {
+ return;
+ }
message.setVersion(_version);
message.setRPCType(binFrameHeader.getRPCType());
message.setFunctionID(binFrameHeader.getFunctionID());
@@ -429,6 +432,9 @@ public class WiProProtocol extends AbstractProtocol { if (_version > 1&& !isControlService) {
BinaryFrameHeader binFrameHeader = BinaryFrameHeader.
parseBinaryHeader(packet.payload);
+ if(binFrameHeader == null) {
+ return;
+ }
message.setVersion(_version);
message.setRPCType(binFrameHeader.getRPCType());
message.setFunctionID(binFrameHeader.getFunctionID());
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java b/sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java index 716d96c59..2ea9cc938 100644 --- a/sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java +++ b/sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java @@ -1,8 +1,5 @@ package com.smartdevicelink.util;
-import java.util.Hashtable;
-import java.util.Vector;
-
import android.util.Log;
import com.smartdevicelink.exception.SdlException;
@@ -18,6 +15,9 @@ import com.smartdevicelink.proxy.RPCStruct; import com.smartdevicelink.proxy.Version;
import com.smartdevicelink.transport.SiphonServer;
+import java.util.Hashtable;
+import java.util.Vector;
+
public class DebugTool {
@@ -306,6 +306,9 @@ public class DebugTool { if (version > 1) {
BinaryFrameHeader binFrameHeader = BinaryFrameHeader.
parseBinaryHeader(packet.getPayload());
+ if(binFrameHeader == null) {
+ return null;
+ }
message.setVersion((byte) version);
message.setRPCType(binFrameHeader.getRPCType());
message.setFunctionID(binFrameHeader.getFunctionID());
|