yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_11.3'

Browse source
This commit is contained in:
ghidra1 2025-01-31 09:16:06 -05:00
commit 0a3d4a28d0
4 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
View file

@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle"

4
Ghidra/Debug/Debugger-agent-gdb/build.gradle
View file

@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle"

4
Ghidra/Debug/Debugger-agent-lldb/build.gradle
View file

@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle"

15
Ghidra/Features/BSim/ghidra_scripts/LocalBSimQueryScript.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -57,6 +57,10 @@ public class LocalBSimQueryScript extends GhidraScript {
popup("This script cannot be run headlessly.");
return;
}
if (currentProgram == null) {
popup("This script requires a program to be open in the tool");
return;
}
Set<Function> sourceFuncs = new HashSet<>();
if (currentSelection == null) {
@ -341,7 +345,6 @@ public class LocalBSimQueryScript extends GhidraScript {
class CompareMatchesExecutor implements TableChooserExecutor {
private FunctionComparisonService compareService;
private MatchedFunctionComparisonModel model;
public CompareMatchesExecutor() {
compareService = state.getTool().getService(FunctionComparisonService.class);
@ -355,11 +358,7 @@ public class LocalBSimQueryScript extends GhidraScript {
@Override
public boolean execute(AddressableRowObject rowObject) {
LocalBSimMatch match = (LocalBSimMatch) rowObject;
if (model == null) {
model = new MatchedFunctionComparisonModel();
compareService.createCustomComparison(model, null);
}
model.addMatch(match.getSourceFunc(), match.getTargetFunc());
compareService.createComparison(match.getSourceFunc(), match.getTargetFunc());
return false;
}
}