Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#2066] avoid NPE in regex matcher #1022

Merged
merged 1 commit into from
Nov 11, 2016
Merged

[#2066] avoid NPE in regex matcher #1022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions framework/src/play/vfs/VirtualFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ public static VirtualFile search(Collection<VirtualFile> roots, String path) {
}

public static VirtualFile fromRelativePath(String relativePath) {
if (relativePath == null) { // avoid NPE in pattern.matcher(relativePath)
return null;
}
Pattern pattern = Pattern.compile("^(\\{(.+?)\\})?(.*)$");
Matcher matcher = pattern.matcher(relativePath);

Expand Down