This repository has been archived by the owner on Mar 3, 2023. It is now read-only.
Fix handling of binary files when using ripgrep scanner #19403
Merged
Conversation
This file contains 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
nathansobo
approved these changes
May 24, 2019
src/ripgrep-directory-searcher.js
Outdated
| } | ||
|
|
||
| return Buffer.from(input.bytes, 'base64').toString() |
There was a problem hiding this comment.
Minor: Putting this in an else block would be more readable to me.
There was a problem hiding this comment.
I've just used a ternary at the end 馃榿
| @@ -280,7 +292,7 @@ module.exports = class RipgrepDirectorySearcher { | |||
|
|
|||
| if (message.type === 'begin') { | |||
| pendingEvent = { | |||
| filePath: message.data.path.text, | |||
| filePath: getText(message.data.path), | |||
There was a problem hiding this comment.
Wow, base64 encoded paths? Awesome.
|
In case anyone is wondering whether there's anything possible in these JSON objects other than |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR is a follow-up of #19348
By pure chance I've found an issue when handling files that have lines with binary content while testing the
ripgrepscanner on thegecko-devrepository.The main problem is found when a file has lines with non-UTF characters it returns a base64 representation of that line in the json output (to not break the JSON formatting). There's more information about it here.
Before this PR, we were not handling this scenario and the parser miserably failed 馃槄