diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-17 15:39:43 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-23 03:36:55 -0800 |
| commit | 2c62f0a15bed02bc6ca014fd113d5e62d9808624 (patch) | |
| tree | bf1a5ce9204efbac9e6a4f3a0462561f92e338da /platform/darwin/src/NSExpression+MGLAdditions.mm | |
| parent | 077cbb5e4b889a457e5bad5557ed4f7fb3d9ac72 (diff) | |
| download | qtlocation-mapboxgl-2c62f0a15bed02bc6ca014fd113d5e62d9808624.tar.gz | |
[ios, macos] Fixed null expression crash
Convert NSNull into an mbgl null value.
Diffstat (limited to 'platform/darwin/src/NSExpression+MGLAdditions.mm')
| -rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index 392a6d7f5b..6af069487e 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -55,9 +55,10 @@ // We use long long here to avoid any truncation. return { (int64_t)number.longLongValue }; } + } else if (value != [NSNull null]) { + [NSException raise:@"Value not handled" + format:@"Can’t convert %s:%@ to mbgl::Value", [value objCType], value]; } - [NSException raise:@"Value not handled" - format:@"Can’t convert %s:%@ to mbgl::Value", [value objCType], value]; return { }; } |