Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-10-2-24'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-10-02 13:03:58 -04:00
commit a8f5ee3e2f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/TreeManager.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -195,6 +195,10 @@ public class TreeManager implements ManagerDB {
*/ */
public String[] getTreeNames() { public String[] getTreeNames() {
String[] names = new String[treeMap.size()]; String[] names = new String[treeMap.size()];
if (names.length == 0) {
return names;
}
try { try {
RecordIterator iter = treeAdapter.getRecords(); RecordIterator iter = treeAdapter.getRecords();

1
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/symbol/StubSymbol.java
View File

@ -37,6 +37,7 @@ public class StubSymbol implements Symbol {
public StubSymbol(String name) { public StubSymbol(String name) {
this.name = name; this.name = name;
id = nextId++;
} }
public StubSymbol(String name, Address address) { public StubSymbol(String name, Address address) {