Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,22 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
return true;
}

// Excludes intents who want to obtain sandbox files.
// Fixes CVE-2020-6563.
if (data != null && data.getData().getPath() != null) {
final String path = data.getData().getPath();
final File file = new File(path);
String normalized;
try {
normalized = file.getCanonicalPath();
} catch (IOException e) {
normalized = path;
}
if (normalized.startsWith("/data")) {
data.setData(Uri.EMPTY);
}
}

// based off of which button was pressed, we get an activity result and a file
// the camera activity doesn't properly return the filename* (I think?) so we use
// this filename instead
Expand Down