Merge pull request #129 from ClayApps/Potential-zero-packet-length-error

Potential zero packet length error
mixedinkey-opensource · Feb 17, 2016 · c4a9f63 · c4a9f63
2 parents 2eaced6 + 5f867b2
commit c4a9f63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Source/MIKMIDIClientDestinationEndpoint.m b/Source/MIKMIDIClientDestinationEndpoint.m
@@ -88,9 +88,10 @@ void MIKMIDIDestinationReadProc(const MIDIPacketList *pktList, void *readProcRef
 		NSMutableArray *receivedCommands = [NSMutableArray array];
 		MIDIPacket *packet = (MIDIPacket *)pktList->packet;
 		for (int i=0; i<pktList->numPackets; i++) {
-			if (packet->length == 0) continue;
-			NSArray *commands = [MIKMIDICommand commandsWithMIDIPacket:packet];
-			if (commands) [receivedCommands addObjectsFromArray:commands];
+            if (packet->length > 0) {
+                NSArray *commands = [MIKMIDICommand commandsWithMIDIPacket:packet];
+                if (commands) [receivedCommands addObjectsFromArray:commands];
+            }
 			packet = MIDIPacketNext(packet);
 		}
 

diff --git a/Source/MIKMIDIInputPort.m b/Source/MIKMIDIInputPort.m
@@ -238,9 +238,10 @@ void MIKMIDIPortReadCallback(const MIDIPacketList *pktList, void *readProcRefCon
 		NSMutableArray *receivedCommands = [NSMutableArray array];
 		MIDIPacket *packet = (MIDIPacket *)pktList->packet;
 		for (int i=0; i<pktList->numPackets; i++) {
-			if (packet->length == 0) continue;
-			NSArray *commands = [MIKMIDICommand commandsWithMIDIPacket:packet];
-			if (commands) [receivedCommands addObjectsFromArray:commands];
+            if (packet->length > 0) {
+                NSArray *commands = [MIKMIDICommand commandsWithMIDIPacket:packet];
+                if (commands) [receivedCommands addObjectsFromArray:commands];
+            }
 			packet = MIDIPacketNext(packet);
 		}