Merge remote-tracking branch 'origin/GP-0_dev747368_fix_fs_lookup_namecomp_null_case'

This commit is contained in:
Ryan Kurtz 2024-12-27 12:29:36 -05:00
commit a968e6701e

View file

@ -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("/");