Fix bulkData and add null check

Author: Henigan

base/src/main/java/com/smartdevicelink/protocol/SecurityQueryPayload.java

@@ -55,11 +55,10 @@ public static SecurityQueryPayload parseBinaryQueryHeader(byte[] binHeader) {
                 byte[] _bulkData;
                 if (msg.getQueryType() == QueryType.NOTIFICATION && msg.getQueryID() == QueryID.SEND_INTERNAL_ERROR) {
                     _bulkData = new byte[binHeader.length - _jsonSize - 12 - 1];
-                    System.arraycopy(binHeader, 12 + _jsonSize, _bulkData, 0, _bulkData.length - 1);
                 } else {
                     _bulkData = new byte[binHeader.length - _jsonSize - 12];
-                    System.arraycopy(binHeader, 12 + _jsonSize, _bulkData, 0, _bulkData.length);
                 }
+                System.arraycopy(binHeader, 12 + _jsonSize, _bulkData, 0, _bulkData.length);
                 msg.setBulkData(_bulkData);
             }
 

base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java

@@ -192,6 +192,10 @@ protected void processControlService(ProtocolMessage msg) {
             return;
 
         SecurityQueryPayload receivedHeader = SecurityQueryPayload.parseBinaryQueryHeader(msg.getData().clone());
+        if (receivedHeader == null) {
+            DebugTool.logError(TAG, "Malformed Security Query Header");
+            return;
+        }
 
         int iLen = msg.getData().length - 12;
         byte[] data = new byte[iLen];