development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 19:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential NPE in iOS doctor check (#8016)

Browse source 
* Fix potential NPE in iOS doctor check

In case Xcode is not installed, the xcode-select path may be null.

* fixup! Fix potential NPE in iOS doctor check
This commit is contained in:
Chris Bracken 2017-02-08 20:04:39 -08:00 committed by GitHub
parent b180caae4a
commit 2ec6b31aac
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/flutter_tools/lib/src/ios/ios_workflow.dart
View file

@ -87,7 +87,7 @@ class IOSWorkflow extends DoctorValidator implements Workflow {
}
} else {
xcodeStatus = ValidationType.missing;
if (xcode.xcodeSelectPath.isEmpty) {
if (xcode.xcodeSelectPath == null || xcode.xcodeSelectPath.isEmpty) {
messages.add(new ValidationMessage.error(
'Xcode not installed; this is necessary for iOS development.\n'
'Download at https://developer.apple.com/xcode/download/.'

4
packages/flutter_tools/lib/src/ios/mac.dart
View file

@ -29,8 +29,8 @@ class Xcode {
_eulaSigned = false;
try {
_xcodeSelectPath = runSync(<String>['xcode-select', '--print-path']);
if (_xcodeSelectPath == null || _xcodeSelectPath.trim().isEmpty) {
_xcodeSelectPath = runSync(<String>['xcode-select', '--print-path'])?.trim();
if (_xcodeSelectPath == null || _xcodeSelectPath.isEmpty) {
_isInstalled = false;
return;
}

4
packages/flutter_tools/test/src/ios/ios_workflow_test.dart
View file

@ -20,7 +20,7 @@ void main() {
testUsingContext('Emit missing status when nothing is installed', () async {
when(xcode.isInstalled).thenReturn(false);
when(xcode.xcodeSelectPath).thenReturn('');
when(xcode.xcodeSelectPath).thenReturn(null);
IOSWorkflowTestTarget workflow = new IOSWorkflowTestTarget()
..hasPythonSixModule = false
..hasHomebrew = false
@ -31,7 +31,7 @@ void main() {
testUsingContext('Emits partial status when Xcode is not installed', () async {
when(xcode.isInstalled).thenReturn(false);
when(xcode.xcodeSelectPath).thenReturn('');
when(xcode.xcodeSelectPath).thenReturn(null);
IOSWorkflowTestTarget workflow = new IOSWorkflowTestTarget();
ValidationResult result = await workflow.validate();
expect(result.type, ValidationType.partial);