Repository navigation
Core hardening: real 7z support + security fixes (Task 6) #184
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -25,6 +25,18 @@ int _getSectorSize(String mode) { | |||||
| return 2352; | ||||||
| } | ||||||
|
|
||||||
| /// Removes one pair of matching surrounding quotes (`"` or `'`) if present. | ||||||
| String _stripSurroundingQuotes(String value) { | ||||||
| if (value.length >= 2) { | ||||||
| final first = value[0]; | ||||||
| final last = value[value.length - 1]; | ||||||
| if ((first == '"' && last == '"') || (first == "'" && last == "'")) { | ||||||
| return value.substring(1, value.length - 1); | ||||||
| } | ||||||
| } | ||||||
| return value; | ||||||
| } | ||||||
|
|
||||||
| class CueTrackIndex { | ||||||
| final int number; | ||||||
| final String msf; | ||||||
|
|
@@ -53,8 +65,10 @@ List<CueTrack> parseCue(String cuePath) { | |||||
| final tracks = <CueTrack>[]; | ||||||
|
|
||||||
| String? currentFile; | ||||||
| // Group 1 is the raw name; group 2 the file type. The name is non-greedy and | ||||||
| // anchored to the end so apostrophes, parentheses and spaces all survive. | ||||||
| final fileRegex = RegExp( | ||||||
| r'^\s*FILE\s+(.+?)\s+(BINARY|WAVE|MP3|AIFF|MOTOROLA)\s*$', | ||||||
|
There was a problem hiding this comment. Reject every unsupported If a CUE declares Proposed parser change
Committable suggestion
 |
||||||
| caseSensitive: false, | ||||||
| ); | ||||||
| final trackRegex = RegExp( | ||||||
|
|
@@ -66,13 +80,24 @@ List<CueTrack> parseCue(String cuePath) { | |||||
| caseSensitive: false, | ||||||
| ); | ||||||
|
|
||||||
| var content = File(cuePath).readAsStringSync(); | ||||||
| if (content.startsWith('\uFEFF')) { | ||||||
| content = content.substring(1); | ||||||
| } | ||||||
| final lines = content.split(RegExp(r'\r\n|\r|\n')); | ||||||
| for (final line in lines) { | ||||||
| final lineStr = line.trim(); | ||||||
| final fm = fileRegex.firstMatch(lineStr); | ||||||
| if (fm != null) { | ||||||
| final rawName = _stripSurroundingQuotes(fm.group(1)!.trim()); | ||||||
| final fileType = fm.group(2)!.toUpperCase(); | ||||||
| if (fileType != 'BINARY') { | ||||||
| throw FormatException( | ||||||
| 'Unsupported FILE type "$fileType" in CUE (only BINARY is ' | ||||||
| 'supported): $cuePath', | ||||||
| ); | ||||||
| } | ||||||
| currentFile = p.join(cueDir, rawName); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Allow hyphens in prerelease identifiers.
3.5.0-rc-1is a valid Dart version, but this check rejects it. All four build jobs then stop before packaging. Allow hyphens within prerelease identifiers in each validator. (raw.githubusercontent.com)