Bugfix/control frame payload init crash

SmartDeviceLink/SDLControlFramePayloadAudioStartServiceAck.m

@@ -37,7 +37,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
 
     _mtu = SDLControlFrameInt64NotFound;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLink/SDLControlFramePayloadEndService.m

@@ -37,7 +37,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
 
     _hashId = SDLControlFrameInt32NotFound;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLink/SDLControlFramePayloadNak.m

@@ -35,7 +35,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
     self = [super init];
     if (!self) return nil;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLink/SDLControlFramePayloadRPCStartService.m

@@ -36,7 +36,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
     self = [super init];
     if (!self) return nil;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLink/SDLControlFramePayloadRPCStartServiceAck.m

@@ -43,7 +43,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
     _hashId = SDLControlFrameInt32NotFound;
     _mtu = SDLControlFrameInt64NotFound;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLink/SDLControlFramePayloadVideoStartService.m

@@ -46,7 +46,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
     _height = SDLControlFrameInt32NotFound;
     _width = SDLControlFrameInt32NotFound;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLink/SDLControlFramePayloadVideoStartServiceAck.m

@@ -47,7 +47,7 @@ - (instancetype)initWithData:(nullable NSData *)data {
     _height = SDLControlFrameInt32NotFound;
     _width = SDLControlFrameInt32NotFound;
 
-    if (data != nil) {
+    if (data.length > 0) {
         [self sdl_parse:data];
     }
 

SmartDeviceLinkTests/ProtocolSpecs/ControlFramePayloadSpecs/SDLControlFramePayloadNakSpec.m

@@ -54,4 +54,18 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadNak *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadNak alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.rejectedParams).to(beNil());
+    });
+});
+
+
 QuickSpecEnd

SmartDeviceLinkTests/ProtocolSpecs/ControlFramePayloadSpecs/SDLControlFramePayloadVideoStartServiceSpec.m

@@ -77,4 +77,17 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadVideoStartService *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadVideoStartService alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.data.length).to(equal(0));
+    });
+});
+
 QuickSpecEnd

SmartDeviceLinkTests/ProtocolSpecs/ControlFramePayloadSpecs/SDLControlFrameVideoStartServiceAckSpec.m

@@ -83,4 +83,17 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadVideoStartServiceAck *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadVideoStartServiceAck alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.data.length).to(equal(0));
+    });
+});
+
 QuickSpecEnd

SmartDeviceLinkTests/ProtocolSpecs/SDLControlFramePayloadAudioStartServiceAckSpec.m

@@ -57,4 +57,18 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadAudioStartServiceAck *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadAudioStartServiceAck alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.mtu).to(equal(-1));
+        expect(testPayload.data.length).to(equal(0));
+    });
+});
+
 QuickSpecEnd

SmartDeviceLinkTests/ProtocolSpecs/SDLControlFramePayloadEndServiceSpec.m

@@ -55,4 +55,18 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadEndService *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadEndService alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.hashId).to(equal(-1));
+        expect(testPayload.data.length).to(equal(0));
+    });
+});
+
 QuickSpecEnd

SmartDeviceLinkTests/ProtocolSpecs/SDLControlFramePayloadRPCStartServiceAckSpec.m

@@ -68,4 +68,17 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadRPCStartServiceAck *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadRPCStartServiceAck alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.data.length).to(equal(0));
+    });
+});
+
 QuickSpecEnd

SmartDeviceLinkTests/ProtocolSpecs/SDLControlFramePayloadRPCStartServiceSpec.m

@@ -57,4 +57,18 @@
     });
 });
 
+describe(@"Test nil data", ^{
+    __block SDLControlFramePayloadRPCStartService *testPayload = nil;
+    __block NSData *testData = nil;
+
+    beforeEach(^{
+        testPayload = [[SDLControlFramePayloadRPCStartService alloc] initWithData:testData];
+    });
+
+    it(@"should output the correct params", ^{
+        expect(testPayload.protocolVersion).to(beNil());
+        expect(testPayload.data.length).to(equal(0));
+    });
+});
+
 QuickSpecEnd