mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 09:49:23 +02:00
Merge remote-tracking branch 'origin/GP-0_dev747368_fix_fs_lookup_namecomp_null_case'
This commit is contained in:
commit
a968e6701e
1 changed files with 2 additions and 2 deletions
|
@ -16,8 +16,7 @@
|
||||||
package ghidra.formats.gfilesystem;
|
package ghidra.formats.gfilesystem;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.Comparator;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import ghidra.app.util.bin.ByteProvider;
|
import ghidra.app.util.bin.ByteProvider;
|
||||||
import ghidra.framework.Application;
|
import ghidra.framework.Application;
|
||||||
|
@ -173,6 +172,7 @@ public abstract class GFileSystemBase implements GFileSystem {
|
||||||
if (path == null || path.equals("/")) {
|
if (path == null || path.equals("/")) {
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
nameComp = Objects.requireNonNullElseGet(nameComp, this::getFilenameComparator);
|
||||||
|
|
||||||
GFile current = root;
|
GFile current = root;
|
||||||
String[] parts = path.split("/");
|
String[] parts = path.split("/");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue