Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ - (NSData*)encode:(id)message {
}

- (id)decode:(NSData*)message {
if (message == nil)
if ([message length] == 0)
return nil;
BOOL isSimpleValue = NO;
id decoded = nil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ - (NSData*)encode:(id)message {
}

- (id)decode:(NSData*)message {
if (message == nil)
if ([message length] == 0)
return nil;
FlutterStandardReader* reader = [_readerWriter readerWithData:message];
id value = [reader readValue];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
ASSERT_TRUE([value isEqualTo:decoded]);
}

TEST(FlutterJSONCodec, CanDecodeZeroLength) {
FlutterJSONMessageCodec* codec = [FlutterJSONMessageCodec sharedInstance];
ASSERT_TRUE([codec decode:[NSData data]] == nil);
}

TEST(FlutterJSONCodec, CanEncodeAndDecodeNil) {
FlutterJSONMessageCodec* codec = [FlutterJSONMessageCodec sharedInstance];
ASSERT_TRUE([codec encode:nil] == nil);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ void checkEncodeDecode(id value) {
ASSERT_TRUE([value isEqual:decoded]);
}

TEST(FlutterStandardCodec, CanDecodeZeroLength) {
FlutterStandardMessageCodec* codec = [FlutterStandardMessageCodec sharedInstance];
id decoded = [codec decode:[NSData data]];
ASSERT_TRUE(decoded == nil);
}

TEST(FlutterStandardCodec, CanEncodeAndDecodeNil) {
checkEncodeDecode(nil, nil);
}
Expand Down
9 changes: 6 additions & 3 deletions shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,12 @@ - (void)sendUserLocales {
}

- (void)engineCallbackOnPlatformMessage:(const FlutterPlatformMessage*)message {
NSData* messageData = [NSData dataWithBytesNoCopy:(void*)message->message
length:message->message_size
freeWhenDone:NO];
NSData* messageData = nil;
if (message->message_size > 0) {
messageData = [NSData dataWithBytesNoCopy:(void*)message->message
length:message->message_size
freeWhenDone:NO];
}
NSString* channel = @(message->channel);
__block const FlutterPlatformMessageResponseHandle* responseHandle = message->response_handle;

Expand Down