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_12.0'

Browse source
This commit is contained in:
ghidra1 2025-09-25 13:11:59 -04:00
commit 5ceb49b11f
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
GPL/vsconfig.gradle
View file

@ -34,7 +34,7 @@ def configureVisualStudio() {
println " -> To manually specify the location of vswhere.exe, add \"-PvswherePath=<vswhere path>\" to the Gradle command line arguments" println " -> To manually specify the location of vswhere.exe, add \"-PvswherePath=<vswhere path>\" to the Gradle command line arguments"
return return
} }
def vswhereProcess = "\"${vswherePath}\" -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json -utf8".execute() def vswhereProcess = "\"${vswherePath}\" -products * -sort -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json -utf8".execute()
def vswhereOutput = vswhereProcess.text.trim() def vswhereOutput = vswhereProcess.text.trim()
def vswhereExit = vswhereProcess.exitValue() def vswhereExit = vswhereProcess.exitValue()
if (vswhereExit != 0) { if (vswhereExit != 0) {
@ -49,11 +49,27 @@ def configureVisualStudio() {
return return
} }
def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput); def vswhereJson = new groovy.json.JsonSlurper().parseText(vswhereOutput);
if (vswhereJson.isEmpty()) { def usePrerelease = project.hasProperty("vswherePrerelease")
def i = -1
println " -> Searching for Visual Studio installations..."
vswhereJson.eachWithIndex { item, index ->
def isPrerelease = item.get("isPrerelease")
def name = item.get("displayName") + (isPrerelease ? " Prerelease" : "")
if (i == -1) {
if (usePrerelease || !isPrerelease) {
i = index
}
}
println " ${index + 1}: ${name}" +
(i == index ? " (selected)" : "") +
(isPrerelease && !usePrerelease ? " (enable with -PvswherePrerelease)" : "")
}
if (i == -1) {
println " -> Visual Studio not found!" println " -> Visual Studio not found!"
return return
} }
def vsInstallDir = vswhereJson[0].installationPath
def vsInstallDir = vswhereJson[i].installationPath
println " -> Installation Directory: ${vsInstallDir}" println " -> Installation Directory: ${vsInstallDir}"
// Use vcvarsall.bat to determine the latest Visual Studio's default SDK and tool versions // Use vcvarsall.bat to determine the latest Visual Studio's default SDK and tool versions

11
Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java
View file

@ -563,14 +563,15 @@ public class CreateThunkFunctionCmd extends BackgroundCommand<Program> {
Listing listing = program.getListing(); Listing listing = program.getListing();
Instruction instr = listing.getInstructionAt(entry); Instruction instr = listing.getInstructionAt(entry);
if (instr == null) {
return null;
}
// if there is no pcode, go to the next instruction // if there is no pcode, go to the next instruction
// assume fallthrough (ie. x86 instruction ENDBR64) // assume fallthrough (ie. x86 instruction ENDBR64)
// TODO: at some point, might need to do a NOP detection // TODO: at some point, might need to do a NOP detection
if (instr.getPcode().length == 0) { while (instr != null && instr.getPcode().length == 0) {
instr = listing.getInstructionAfter(entry); instr = listing.getInstructionAfter(instr.getAddress());
}
if (instr == null) {
return null;
} }
FlowType flowType; FlowType flowType;