Skip to content

[pigeon] fix swift nsnull casting crash #3545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarrinneal merged 30 commits into from
Apr 4, 2023
Merged

[pigeon] fix swift nsnull casting crash #3545

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
574ee0b
crash fix
tarrinneal Mar 24, 2023
46ca75e
remove need for function
tarrinneal Mar 25, 2023
e350040
cleaner method method
tarrinneal Mar 29, 2023
3d31aff
better name
tarrinneal Mar 29, 2023
3be7eb1
fix enums and tests
tarrinneal Mar 30, 2023
ef111ee
enum fixes, and Any casting
tarrinneal Mar 30, 2023
6d5271f
gen test
tarrinneal Mar 30, 2023
a4625f8
Merge branch 'main' of github.com:flutter/packages into swift-nil
tarrinneal Mar 30, 2023
29ac0ec
simplify casting enum
tarrinneal Mar 30, 2023
4a7b408
Figured it out
tarrinneal Mar 30, 2023
d1d9c6f
Better name
tarrinneal Mar 31, 2023
241f0e3
gen tests
tarrinneal Mar 31, 2023
8d356cc
some nits
tarrinneal Mar 31, 2023
04dfdbd
writedecodecasting init
tarrinneal Mar 31, 2023
ed57271
This works, but does it explode on incorect type?
tarrinneal Apr 1, 2023
1bd3afa
cleaner with as Any
tarrinneal Apr 1, 2023
d0f9b86
gen test
tarrinneal Apr 1, 2023
fab7ca3
Merge branch 'main' of github.com:flutter/packages into swift-nil
tarrinneal Apr 1, 2023
2e2d337
comment
tarrinneal Apr 3, 2023
5b39dbe
fix NSNull issue in EchoBinaryMessenger
tarrinneal Apr 3, 2023
cbb8e0b
makes things better
tarrinneal Apr 4, 2023
7fa0f7d
gen tests
tarrinneal Apr 4, 2023
b0c7653
Improve _writeDecodeCasting
tarrinneal Apr 4, 2023
740abd8
Merge branch 'main' of github.com:flutter/packages into swift-nil
tarrinneal Apr 4, 2023
748a0bb
assert message
tarrinneal Apr 4, 2023
d8f5fe3
nits
tarrinneal Apr 4, 2023
06ab71e
comment
tarrinneal Apr 4, 2023
547ed02
nested ternary
tarrinneal Apr 4, 2023
367009e
gen test
tarrinneal Apr 4, 2023
cdf35ff
nits
tarrinneal Apr 4, 2023
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
10 changes: 7 additions & 3 deletions packages/pigeon/lib/swift_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,9 +608,13 @@ import FlutterMacOS
// Special-cased to avoid warnings about using 'as' with Any.
return value;
} else if (type.baseName == 'int') {
final String orString =
type.isNullable ? 'nilOrValue($value)' : '$value as! Int64';
return '($value is Int32) ? Int64($value as! Int32) : $orString';
if (type.isNullable) {
// Nullable ints need to check for NSNull, nil, and Int32 before casting can be done safely.
// This nested ternary is a necessary evil to avoid less efficient conversions.
return '$value is NSNull ? nil : ($value is Int64 ? $value as! Int64? : Int64($value as! Int32))';
} else {
return '$value is Int64 ? $value as! Int64 : Int64($value as! Int32)';
}
} else if (type.isNullable) {
return 'nilOrValue($value)';
} else {
Expand Down
28 changes: 14 additions & 14 deletions packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ struct AllTypes {

static func fromList(_ list: [Any]) -> AllTypes? {
let aBool = list[0] as! Bool
let anInt = (list[1] is Int32) ? Int64(list[1] as! Int32) : list[1] as! Int64
let anInt64 = (list[2] is Int32) ? Int64(list[2] as! Int32) : list[2] as! Int64
let anInt = list[1] is Int64 ? list[1] as! Int64 : Int64(list[1] as! Int32)
let anInt64 = list[2] is Int64 ? list[2] as! Int64 : Int64(list[2] as! Int32)
let aDouble = list[3] as! Double
let aByteArray = list[4] as! FlutterStandardTypedData
let a4ByteArray = list[5] as! FlutterStandardTypedData
Expand Down Expand Up @@ -126,8 +126,8 @@ struct AllNullableTypes {

static func fromList(_ list: [Any]) -> AllNullableTypes? {
let aNullableBool: Bool? = nilOrValue(list[0])
let aNullableInt: Int64? = (list[1] is Int32) ? Int64(list[1] as! Int32) : nilOrValue(list[1])
let aNullableInt64: Int64? = (list[2] is Int32) ? Int64(list[2] as! Int32) : nilOrValue(list[2])
let aNullableInt: Int64? = list[1] is NSNull ? nil : (list[1] is Int64 ? list[1] as! Int64? : Int64(list[1] as! Int32))
let aNullableInt64: Int64? = list[2] is NSNull ? nil : (list[2] is Int64 ? list[2] as! Int64? : Int64(list[2] as! Int32))
let aNullableDouble: Double? = nilOrValue(list[3])
let aNullableByteArray: FlutterStandardTypedData? = nilOrValue(list[4])
let aNullable4ByteArray: FlutterStandardTypedData? = nilOrValue(list[5])
Expand Down Expand Up @@ -481,7 +481,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg = (args[0] is Int32) ? Int64(args[0] as! Int32) : args[0] as! Int64
let anIntArg = args[0] is Int64 ? args[0] as! Int64 : Int64(args[0] as! Int32)
do {
let result = try api.echo(anIntArg)
reply(wrapResult(result))
Expand Down Expand Up @@ -660,7 +660,7 @@ class HostIntegrationCoreApiSetup {
sendMultipleNullableTypesChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let aNullableBoolArg: Bool? = nilOrValue(args[0])
let aNullableIntArg: Int64? = (args[1] is Int32) ? Int64(args[1] as! Int32) : nilOrValue(args[1])
let aNullableIntArg: Int64? = args[1] is NSNull ? nil : (args[1] is Int64 ? args[1] as! Int64? : Int64(args[1] as! Int32))
let aNullableStringArg: String? = nilOrValue(args[2])
do {
let result = try api.sendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg)
Expand All @@ -677,7 +677,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoNullableIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let aNullableIntArg: Int64? = (args[0] is Int32) ? Int64(args[0] as! Int32) : nilOrValue(args[0])
let aNullableIntArg: Int64? = args[0] is NSNull ? nil : (args[0] is Int64 ? args[0] as! Int64? : Int64(args[0] as! Int32))
do {
let result = try api.echo(aNullableIntArg)
reply(wrapResult(result))
Expand Down Expand Up @@ -822,7 +822,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoAsyncIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg = (args[0] is Int32) ? Int64(args[0] as! Int32) : args[0] as! Int64
let anIntArg = args[0] is Int64 ? args[0] as! Int64 : Int64(args[0] as! Int32)
api.echoAsync(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1050,7 +1050,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoAsyncNullableIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg: Int64? = (args[0] is Int32) ? Int64(args[0] as! Int32) : nilOrValue(args[0])
let anIntArg: Int64? = args[0] is NSNull ? nil : (args[0] is Int64 ? args[0] as! Int64? : Int64(args[0] as! Int32))
api.echoAsyncNullable(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1256,7 +1256,7 @@ class HostIntegrationCoreApiSetup {
callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let aNullableBoolArg: Bool? = nilOrValue(args[0])
let aNullableIntArg: Int64? = (args[1] is Int32) ? Int64(args[1] as! Int32) : nilOrValue(args[1])
let aNullableIntArg: Int64? = args[1] is NSNull ? nil : (args[1] is Int64 ? args[1] as! Int64? : Int64(args[1] as! Int32))
let aNullableStringArg: String? = nilOrValue(args[2])
api.callFlutterSendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg) { result in
switch result {
Expand Down Expand Up @@ -1291,7 +1291,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
callFlutterEchoIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg = (args[0] is Int32) ? Int64(args[0] as! Int32) : args[0] as! Int64
let anIntArg = args[0] is Int64 ? args[0] as! Int64 : Int64(args[0] as! Int32)
api.callFlutterEcho(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1410,7 +1410,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg: Int64? = (args[0] is Int32) ? Int64(args[0] as! Int32) : nilOrValue(args[0])
let anIntArg: Int64? = args[0] is NSNull ? nil : (args[0] is Int64 ? args[0] as! Int64? : Int64(args[0] as! Int32))
api.callFlutterEchoNullable(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1634,7 +1634,7 @@ class FlutterIntegrationCoreApi {
func echo(_ anIntArg: Int64, completion: @escaping (Int64) -> Void) {
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec)
channel.sendMessage([anIntArg] as [Any?]) { response in
let result = (response is Int32) ? Int64(response as! Int32) : response as! Int64
let result = response is Int64 ? response as! Int64 : Int64(response as! Int32)
completion(result)
}
}
Expand Down Expand Up @@ -1690,7 +1690,7 @@ class FlutterIntegrationCoreApi {
func echoNullable(_ anIntArg: Int64?, completion: @escaping (Int64?) -> Void) {
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
channel.sendMessage([anIntArg] as [Any?]) { response in
let result: Int64? = (response is Int32) ? Int64(response as! Int32) : nilOrValue(response)
let result: Int64? = response is NSNull ? nil : (response is Int64 ? response as! Int64? : Int64(response as! Int32))
completion(result)
}
}
Expand Down
28 changes: 14 additions & 14 deletions packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ struct AllTypes {

static func fromList(_ list: [Any]) -> AllTypes? {
let aBool = list[0] as! Bool
let anInt = (list[1] is Int32) ? Int64(list[1] as! Int32) : list[1] as! Int64
let anInt64 = (list[2] is Int32) ? Int64(list[2] as! Int32) : list[2] as! Int64
let anInt = list[1] is Int64 ? list[1] as! Int64 : Int64(list[1] as! Int32)
let anInt64 = list[2] is Int64 ? list[2] as! Int64 : Int64(list[2] as! Int32)
let aDouble = list[3] as! Double
let aByteArray = list[4] as! FlutterStandardTypedData
let a4ByteArray = list[5] as! FlutterStandardTypedData
Expand Down Expand Up @@ -126,8 +126,8 @@ struct AllNullableTypes {

static func fromList(_ list: [Any]) -> AllNullableTypes? {
let aNullableBool: Bool? = nilOrValue(list[0])
let aNullableInt: Int64? = (list[1] is Int32) ? Int64(list[1] as! Int32) : nilOrValue(list[1])
let aNullableInt64: Int64? = (list[2] is Int32) ? Int64(list[2] as! Int32) : nilOrValue(list[2])
let aNullableInt: Int64? = list[1] is NSNull ? nil : (list[1] is Int64 ? list[1] as! Int64? : Int64(list[1] as! Int32))
let aNullableInt64: Int64? = list[2] is NSNull ? nil : (list[2] is Int64 ? list[2] as! Int64? : Int64(list[2] as! Int32))
let aNullableDouble: Double? = nilOrValue(list[3])
let aNullableByteArray: FlutterStandardTypedData? = nilOrValue(list[4])
let aNullable4ByteArray: FlutterStandardTypedData? = nilOrValue(list[5])
Expand Down Expand Up @@ -481,7 +481,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg = (args[0] is Int32) ? Int64(args[0] as! Int32) : args[0] as! Int64
let anIntArg = args[0] is Int64 ? args[0] as! Int64 : Int64(args[0] as! Int32)
do {
let result = try api.echo(anIntArg)
reply(wrapResult(result))
Expand Down Expand Up @@ -660,7 +660,7 @@ class HostIntegrationCoreApiSetup {
sendMultipleNullableTypesChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let aNullableBoolArg: Bool? = nilOrValue(args[0])
let aNullableIntArg: Int64? = (args[1] is Int32) ? Int64(args[1] as! Int32) : nilOrValue(args[1])
let aNullableIntArg: Int64? = args[1] is NSNull ? nil : (args[1] is Int64 ? args[1] as! Int64? : Int64(args[1] as! Int32))
let aNullableStringArg: String? = nilOrValue(args[2])
do {
let result = try api.sendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg)
Expand All @@ -677,7 +677,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoNullableIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let aNullableIntArg: Int64? = (args[0] is Int32) ? Int64(args[0] as! Int32) : nilOrValue(args[0])
let aNullableIntArg: Int64? = args[0] is NSNull ? nil : (args[0] is Int64 ? args[0] as! Int64? : Int64(args[0] as! Int32))
do {
let result = try api.echo(aNullableIntArg)
reply(wrapResult(result))
Expand Down Expand Up @@ -822,7 +822,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoAsyncIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg = (args[0] is Int32) ? Int64(args[0] as! Int32) : args[0] as! Int64
let anIntArg = args[0] is Int64 ? args[0] as! Int64 : Int64(args[0] as! Int32)
api.echoAsync(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1050,7 +1050,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
echoAsyncNullableIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg: Int64? = (args[0] is Int32) ? Int64(args[0] as! Int32) : nilOrValue(args[0])
let anIntArg: Int64? = args[0] is NSNull ? nil : (args[0] is Int64 ? args[0] as! Int64? : Int64(args[0] as! Int32))
api.echoAsyncNullable(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1256,7 +1256,7 @@ class HostIntegrationCoreApiSetup {
callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let aNullableBoolArg: Bool? = nilOrValue(args[0])
let aNullableIntArg: Int64? = (args[1] is Int32) ? Int64(args[1] as! Int32) : nilOrValue(args[1])
let aNullableIntArg: Int64? = args[1] is NSNull ? nil : (args[1] is Int64 ? args[1] as! Int64? : Int64(args[1] as! Int32))
let aNullableStringArg: String? = nilOrValue(args[2])
api.callFlutterSendMultipleNullableTypes(aBool: aNullableBoolArg, anInt: aNullableIntArg, aString: aNullableStringArg) { result in
switch result {
Expand Down Expand Up @@ -1291,7 +1291,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
callFlutterEchoIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg = (args[0] is Int32) ? Int64(args[0] as! Int32) : args[0] as! Int64
let anIntArg = args[0] is Int64 ? args[0] as! Int64 : Int64(args[0] as! Int32)
api.callFlutterEcho(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1410,7 +1410,7 @@ class HostIntegrationCoreApiSetup {
if let api = api {
callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in
let args = message as! [Any]
let anIntArg: Int64? = (args[0] is Int32) ? Int64(args[0] as! Int32) : nilOrValue(args[0])
let anIntArg: Int64? = args[0] is NSNull ? nil : (args[0] is Int64 ? args[0] as! Int64? : Int64(args[0] as! Int32))
api.callFlutterEchoNullable(anIntArg) { result in
switch result {
case .success(let res):
Expand Down Expand Up @@ -1634,7 +1634,7 @@ class FlutterIntegrationCoreApi {
func echo(_ anIntArg: Int64, completion: @escaping (Int64) -> Void) {
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoInt", binaryMessenger: binaryMessenger, codec: codec)
channel.sendMessage([anIntArg] as [Any?]) { response in
let result = (response is Int32) ? Int64(response as! Int32) : response as! Int64
let result = response is Int64 ? response as! Int64 : Int64(response as! Int32)
completion(result)
}
}
Expand Down Expand Up @@ -1690,7 +1690,7 @@ class FlutterIntegrationCoreApi {
func echoNullable(_ anIntArg: Int64?, completion: @escaping (Int64?) -> Void) {
let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.FlutterIntegrationCoreApi.echoNullableInt", binaryMessenger: binaryMessenger, codec: codec)
channel.sendMessage([anIntArg] as [Any?]) { response in
let result: Int64? = (response is Int32) ? Int64(response as! Int32) : nilOrValue(response)
let result: Int64? = response is NSNull ? nil : (response is Int64 ? response as! Int64? : Int64(response as! Int32))
completion(result)
}
}
Expand Down