Skip to content

host: unsigned-correct range filtering + fix unbounded getComments scan #18

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

Merged
0xeb merged 1 commit into from
Jun 23, 2026
Merged

host: unsigned-correct range filtering + fix unbounded getComments scan #18

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions ghidra-extension/src/main/java/libghidra/host/runtime/DecompilerRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ public DecompilerContract.ListDecompilationsResponse listDecompilations(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new DecompilerContract.ListDecompilationsResponse(List.of());
}

Expand All @@ -88,10 +88,10 @@ public DecompilerContract.ListDecompilationsResponse listDecompilations(
continue;
}
long address = function.getEntryPoint().getOffset();
if (address < startOffset) {
if (Long.compareUnsigned(address, startOffset) < 0) {
continue;
}
if (address > endOffset) {
if (Long.compareUnsigned(address, endOffset) > 0) {
break;
}
if (seen++ < offset) {
Expand Down
58 changes: 29 additions & 29 deletions ghidra-extension/src/main/java/libghidra/host/runtime/FunctionsRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ public FunctionsContract.ListFunctionsResponse listFunctions(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new FunctionsContract.ListFunctionsResponse(List.of());
}

Expand All @@ -97,10 +97,10 @@ public FunctionsContract.ListFunctionsResponse listFunctions(
continue;
}
long address = function.getEntryPoint().getOffset();
if (address < startOffset) {
if (Long.compareUnsigned(address, startOffset) < 0) {
continue;
}
if (address > endOffset) {
if (Long.compareUnsigned(address, endOffset) > 0) {
break;
}
if (seen++ < offset) {
Expand Down Expand Up @@ -187,8 +187,8 @@ public FunctionsContract.ListBasicBlocksResponse listBasicBlocks(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) {
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) {
startOff = defaultStart;
}
int offset = request != null ? Math.max(0, request.offset()) : 0;
Expand All @@ -202,10 +202,10 @@ public FunctionsContract.ListBasicBlocksResponse listBasicBlocks(
while (funcIter.hasNext() && rows.size() < limit) {
Function func = funcIter.next();
long funcEntry = func.getEntryPoint().getOffset();
if (funcEntry < startOff) {
if (Long.compareUnsigned(funcEntry, startOff) < 0) {
continue;
}
if (funcEntry > endOff) {
if (Long.compareUnsigned(funcEntry, endOff) > 0) {
break;
}
AddressSetView body = func.getBody();
Expand Down Expand Up @@ -244,8 +244,8 @@ public FunctionsContract.ListCFGEdgesResponse listCFGEdges(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) {
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) {
startOff = defaultStart;
}
int offset = request != null ? Math.max(0, request.offset()) : 0;
Expand All @@ -259,10 +259,10 @@ public FunctionsContract.ListCFGEdgesResponse listCFGEdges(
while (funcIter.hasNext() && rows.size() < limit) {
Function func = funcIter.next();
long funcEntry = func.getEntryPoint().getOffset();
if (funcEntry < startOff) {
if (Long.compareUnsigned(funcEntry, startOff) < 0) {
continue;
}
if (funcEntry > endOff) {
if (Long.compareUnsigned(funcEntry, endOff) > 0) {
break;
}
AddressSetView body = func.getBody();
Expand Down Expand Up @@ -450,8 +450,8 @@ public FunctionsContract.ListSwitchTablesResponse listSwitchTables(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) { startOff = defaultStart; }
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) { startOff = defaultStart; }
int pOffset = request != null ? Math.max(0, request.offset()) : 0;
int limit = request != null && request.limit() > 0 ? request.limit() : 4096;

Expand All @@ -467,8 +467,8 @@ public FunctionsContract.ListSwitchTablesResponse listSwitchTables(
while (funcIter.hasNext() && rows.size() < limit) {
Function func = funcIter.next();
long funcEntry = func.getEntryPoint().getOffset();
if (funcEntry < startOff) { continue; }
if (funcEntry > endOff) { break; }
if (Long.compareUnsigned(funcEntry, startOff) < 0) { continue; }
if (Long.compareUnsigned(funcEntry, endOff) > 0) { break; }
if (func.isExternal()) { continue; }

DecompileResults results =
Expand Down Expand Up @@ -527,8 +527,8 @@ public FunctionsContract.ListDominatorsResponse listDominators(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) { startOff = defaultStart; }
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) { startOff = defaultStart; }
int pOffset = request != null ? Math.max(0, request.offset()) : 0;
int limit = request != null && request.limit() > 0 ? request.limit() : 4096;

Expand All @@ -540,8 +540,8 @@ public FunctionsContract.ListDominatorsResponse listDominators(
while (funcIter.hasNext() && rows.size() < limit) {
Function func = funcIter.next();
long funcEntry = func.getEntryPoint().getOffset();
if (funcEntry < startOff) { continue; }
if (funcEntry > endOff) { break; }
if (Long.compareUnsigned(funcEntry, startOff) < 0) { continue; }
if (Long.compareUnsigned(funcEntry, endOff) > 0) { break; }

List<FunctionsContract.DominatorRecord> funcDoms =
buildDominatorRecords(func, blockModel, false);
Expand Down Expand Up @@ -572,8 +572,8 @@ public FunctionsContract.ListPostDominatorsResponse listPostDominators(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) { startOff = defaultStart; }
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) { startOff = defaultStart; }
int pOffset = request != null ? Math.max(0, request.offset()) : 0;
int limit = request != null && request.limit() > 0 ? request.limit() : 4096;

Expand All @@ -585,8 +585,8 @@ public FunctionsContract.ListPostDominatorsResponse listPostDominators(
while (funcIter.hasNext() && rows.size() < limit) {
Function func = funcIter.next();
long funcEntry = func.getEntryPoint().getOffset();
if (funcEntry < startOff) { continue; }
if (funcEntry > endOff) { break; }
if (Long.compareUnsigned(funcEntry, startOff) < 0) { continue; }
if (Long.compareUnsigned(funcEntry, endOff) > 0) { break; }

List<FunctionsContract.DominatorRecord> reversedDoms =
buildDominatorRecords(func, blockModel, true);
Expand Down Expand Up @@ -619,8 +619,8 @@ public FunctionsContract.ListLoopsResponse listLoops(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) { startOff = defaultStart; }
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) { startOff = defaultStart; }
int pOffset = request != null ? Math.max(0, request.offset()) : 0;
int limit = request != null && request.limit() > 0 ? request.limit() : 4096;

Expand All @@ -636,8 +636,8 @@ public FunctionsContract.ListLoopsResponse listLoops(
while (funcIter.hasNext() && rows.size() < limit) {
Function func = funcIter.next();
long funcEntry = func.getEntryPoint().getOffset();
if (funcEntry < startOff) { continue; }
if (funcEntry > endOff) { break; }
if (Long.compareUnsigned(funcEntry, startOff) < 0) { continue; }
if (Long.compareUnsigned(funcEntry, endOff) > 0) { break; }
if (func.isExternal()) { continue; }

DecompileResults results =
Expand Down
58 changes: 32 additions & 26 deletions ghidra-extension/src/main/java/libghidra/host/runtime/ListingRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public ListingContract.ListInstructionsResponse listInstructions(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new ListingContract.ListInstructionsResponse(List.of());
}

Expand All @@ -88,10 +88,10 @@ public ListingContract.ListInstructionsResponse listInstructions(
while (it.hasNext()) {
Instruction instruction = it.next();
long address = instruction.getAddress().getOffset();
if (address < startOffset) {
if (Long.compareUnsigned(address, startOffset) < 0) {
continue;
}
if (address > endOffset) {
if (Long.compareUnsigned(address, endOffset) > 0) {
break;
}
if (seen++ < offset) {
Expand Down Expand Up @@ -120,11 +120,11 @@ public ListingContract.GetCommentsResponse getComments(ListingContract.GetCommen
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new ListingContract.GetCommentsResponse(List.of());
}

Expand Down Expand Up @@ -159,9 +159,15 @@ public ListingContract.GetCommentsResponse getComments(ListingContract.GetCommen
}

// Range path: iterate code units with early termination.
// Clamp the end to the start space's max (an unbounded request carries
// endOffset = -1/INT64_MAX) and intersect with loaded memory, so we never
// walk undefined code units across the empty gap up to the top of the
// address space — that turns a "list all comments" query into a hang.
Address start = toAddress(program, startOffset);
Address end = toAddress(program, endOffset);
AddressSet set = new AddressSet(start, end);
long spaceMax = start.getAddressSpace().getMaxAddress().getOffset();
long clampedEnd = Long.compareUnsigned(endOffset, spaceMax) > 0 ? spaceMax : endOffset;
Address end = toAddress(program, clampedEnd);
AddressSet set = new AddressSet(start, end).intersect(program.getMemory());
CodeUnitIterator it = listing.getCodeUnits(set, true);
int pageOffset = request != null ? Math.max(0, request.offset()) : 0;
int limit = request != null && request.limit() > 0 ? request.limit() : 512;
Expand Down Expand Up @@ -372,11 +378,11 @@ public ListingContract.ListDataItemsResponse listDataItems(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new ListingContract.ListDataItemsResponse(List.of());
}
int offset = request != null ? Math.max(0, request.offset()) : 0;
Expand All @@ -393,7 +399,7 @@ public ListingContract.ListDataItemsResponse listDataItems(
}
Address address = data.getAddress();
long addressOffset = address.getOffset();
if (addressOffset < startOffset || addressOffset > endOffset) {
if (Long.compareUnsigned(addressOffset, startOffset) < 0 || Long.compareUnsigned(addressOffset, endOffset) > 0) {
continue;
}
long endAddress = data.getMaxAddress() != null
Expand Down Expand Up @@ -439,11 +445,11 @@ public ListingContract.ListBookmarksResponse listBookmarks(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new ListingContract.ListBookmarksResponse(List.of());
}

Expand All @@ -465,7 +471,7 @@ public ListingContract.ListBookmarksResponse listBookmarks(
continue;
}
long address = bookmark.getAddress().getOffset();
if (address < startOffset || address > endOffset) {
if (Long.compareUnsigned(address, startOffset) < 0 || Long.compareUnsigned(address, endOffset) > 0) {
continue;
}
if (!typeFilter.isEmpty() && !typeFilter.equals(bookmark.getTypeString())) {
Expand Down Expand Up @@ -582,11 +588,11 @@ public ListingContract.ListBreakpointsResponse listBreakpoints(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new ListingContract.ListBreakpointsResponse(List.of());
}

Expand All @@ -605,7 +611,7 @@ public ListingContract.ListBreakpointsResponse listBreakpoints(
for (Bookmark bookmark : BreakpointBookmarkStore.all(manager)) {
BreakpointBookmarkStore.BreakpointRecord row =
BreakpointBookmarkStore.fromBookmark(bookmark);
if (row.address < startOffset || row.address > endOffset) {
if (Long.compareUnsigned(row.address, startOffset) < 0 || Long.compareUnsigned(row.address, endOffset) > 0) {
continue;
}
if (!kindFilter.isEmpty() &&
Expand Down Expand Up @@ -830,8 +836,8 @@ public ListingContract.ListDefinedStringsResponse listDefinedStrings(
try {
long defaultStart = program.getMinAddress().getOffset();
long startOff = request != null ? request.rangeStart() : defaultStart;
long endOff = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOff <= 0) {
long endOff = request != null ? request.rangeEnd() : -1L;
if (startOff == 0) {
startOff = defaultStart;
}
int offset = request != null ? Math.max(0, request.offset()) : 0;
Expand All @@ -843,10 +849,10 @@ public ListingContract.ListDefinedStringsResponse listDefinedStrings(
program,
dt -> dt instanceof ghidra.program.model.data.AbstractStringDataType)) {
long addr = data.getAddress().getOffset();
if (addr < startOff) {
if (Long.compareUnsigned(addr, startOff) < 0) {
continue;
}
if (addr > endOff) {
if (Long.compareUnsigned(addr, endOff) > 0) {
break;
}
if (seen++ < offset) {
Expand Down
15 changes: 0 additions & 15 deletions ghidra-extension/src/main/java/libghidra/host/runtime/RuntimeSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,6 @@ protected static Address toAddress(Program program, long offset) {
}
}

/**
* Normalize a "list" RPC's range-end offset, treating a non-positive value as unbounded.
*
* <p>The C++ client encodes an unbounded upper bound as the protobuf {@code uint64}
* {@code UINT64_MAX}, which is decoded here into a signed Java {@code long} as {@code -1}.
* Earlier code fell back to {@code program.getMaxAddress().getOffset()} for any
* non-positive end; for programs whose maximum address lives in a low-offset space (an
* EXTERNAL block, or file-backed "OTHER" sections at offset 0) that collapsed the scan
* window and made range-filtered tables return no rows. Treating it as
* {@link Long#MAX_VALUE} keeps the scan unbounded. See ghidrasql #2/#3/#6.
*/
protected static long resolveRangeEnd(long requestedEnd) {
return requestedEnd <= 0 ? Long.MAX_VALUE : requestedEnd;
}

protected static void writeBytesForceWritable(Program program, Address address, byte[] data)
throws MemoryAccessException {
Memory memory = program.getMemory();
Expand Down
10 changes: 5 additions & 5 deletions ghidra-extension/src/main/java/libghidra/host/runtime/SymbolsRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ public SymbolsContract.ListSymbolsResponse listSymbols(SymbolsContract.ListSymbo
try {
long defaultStart = program.getMinAddress().getOffset();
long startOffset = request != null ? request.rangeStart() : defaultStart;
long endOffset = resolveRangeEnd(request != null ? request.rangeEnd() : 0);
if (startOffset <= 0) {
long endOffset = request != null ? request.rangeEnd() : -1L;
if (startOffset == 0) {
startOffset = defaultStart;
}
if (endOffset < startOffset) {
if (Long.compareUnsigned(endOffset, startOffset) < 0) {
return new SymbolsContract.ListSymbolsResponse(List.of());
}

Expand All @@ -70,10 +70,10 @@ public SymbolsContract.ListSymbolsResponse listSymbols(SymbolsContract.ListSymbo
continue;
}
long address = symbol.getAddress().getOffset();
if (address < startOffset) {
if (Long.compareUnsigned(address, startOffset) < 0) {
continue;
}
if (address > endOffset) {
if (Long.compareUnsigned(address, endOffset) > 0) {
break;
}
if (seen++ < offset) {
Expand Down
Loading
Loading