Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0af2a84c
Unverified
Commit
0af2a84c
authored
Oct 02, 2019
by
Jonah Williams
Committed by
GitHub
Oct 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle empty entry in asset list and add more explicit validation (#41735)
parent
b1a6aa3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
6 deletions
+37
-6
flutter_manifest.dart
packages/flutter_tools/lib/src/flutter_manifest.dart
+17
-6
flutter_manifest_test.dart
...utter_tools/test/general.shard/flutter_manifest_test.dart
+20
-0
No files found.
packages/flutter_tools/lib/src/flutter_manifest.dart
View file @
0af2a84c
...
...
@@ -186,16 +186,27 @@ class FlutterManifest {
:
fontList
.
map
<
Map
<
String
,
dynamic
>>(
castStringKeyedMap
).
toList
();
}
List
<
Uri
>
get
assets
{
List
<
Uri
>
get
assets
=>
_assets
??=
_computeAssets
();
List
<
Uri
>
_assets
;
List
<
Uri
>
_computeAssets
()
{
final
List
<
dynamic
>
assets
=
_flutterDescriptor
[
'assets'
];
if
(
assets
==
null
)
{
return
const
<
Uri
>[];
}
return
assets
.
cast
<
String
>()
.
map
<
String
>(
Uri
.
encodeFull
)
?.
map
<
Uri
>(
Uri
.
parse
)
?.
toList
();
final
List
<
Uri
>
results
=
<
Uri
>[];
for
(
Object
asset
in
assets
)
{
if
(
asset
is
!
String
||
asset
==
null
||
asset
==
''
)
{
printError
(
'Asset manifest contains a null or empty uri.'
);
continue
;
}
final
String
stringAsset
=
asset
;
try
{
results
.
add
(
Uri
.
parse
(
Uri
.
encodeFull
(
stringAsset
)));
}
on
FormatException
{
printError
(
'Asset manifest contains invalid uri:
$asset
.'
);
}
}
return
results
;
}
List
<
Font
>
_fonts
;
...
...
packages/flutter_tools/test/general.shard/flutter_manifest_test.dart
View file @
0af2a84c
...
...
@@ -572,6 +572,26 @@ flutter:
expect
(
flutterManifest
,
null
);
expect
(
logger
.
errorText
,
contains
(
'Expected a map.'
));
});
testUsingContext
(
'Does not crash on empty entry'
,
()
async
{
final
BufferLogger
logger
=
context
.
get
<
Logger
>();
const
String
manifest
=
'''
name: test
dependencies:
flutter:
sdk: flutter
flutter:
uses-material-design: true
assets:
- lib/gallery/example_code.dart
-
'''
;
final
FlutterManifest
flutterManifest
=
FlutterManifest
.
createFromString
(
manifest
);
final
List
<
Uri
>
assets
=
flutterManifest
.
assets
;
expect
(
logger
.
errorText
,
contains
(
'Asset manifest contains a null or empty uri.'
));
expect
(
assets
.
length
,
1
);
});
});
group
(
'FlutterManifest with MemoryFileSystem'
,
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment