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

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

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-16 14:11:01 -04:00
commit cdb48034ff
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest
View File

@ -1,5 +1,5 @@
MODULE FILE LICENSE: pypkg/dist/capstone-5.0.1-py3-none-win_amd64.whl BSD-3-CAPSTONE MODULE FILE LICENSE: pypkg/dist/capstone-5.0.1-py3-none-win_amd64.whl BSD-3-CAPSTONE
MODULE FILE LICENSE: pypkg/dist/comtypes-1.4.1-py3-none-any.whl MIT MODULE FILE LICENSE: pypkg/dist/comtypes-1.4.1-py3-none-any.whl MIT
MODULE FILE LICENSE: pypkg/dist/Pybag-2.2.10-py3-none-any.whl MIT MODULE FILE LICENSE: pypkg/dist/Pybag-2.2.12-py3-none-any.whl MIT
MODULE FILE LICENSE: pypkg/dist/pywin32-306-cp312-cp312-win_amd64.whl Python Software Foundation License MODULE FILE LICENSE: pypkg/dist/pywin32-306-cp312-cp312-win_amd64.whl Python Software Foundation License

6
Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
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.
@ -93,7 +93,7 @@ else {
} }
} }
distributePyDep("Pybag-2.2.10-py3-none-any.whl") distributePyDep("Pybag-2.2.12-py3-none-any.whl")
distributePyDep("capstone-5.0.1-py3-none-win_amd64.whl") distributePyDep("capstone-5.0.1-py3-none-win_amd64.whl")
distributePyDep("comtypes-1.4.1-py3-none-any.whl") distributePyDep("comtypes-1.4.1-py3-none-any.whl")
distributePyDep("pywin32-306-cp312-cp312-win_amd64.whl") distributePyDep("pywin32-306-cp312-cp312-win_amd64.whl")

2
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java
View File

@ -4527,7 +4527,7 @@ public class RecoveredClassHelper {
// apply the structure. It has to be one or the other and the correct length // apply the structure. It has to be one or the other and the correct length
// because of the check at the beginning of the script that checked for either // because of the check at the beginning of the script that checked for either
// array or structure of pointers and got size from them initially // array or structure of pointers and got size from them initially
api.clearListing(vftableAddress); api.clearListing(vftableAddress, vftableAddress.add(vftableStruct.getLength() - 1));
api.createData(vftableAddress, vftableStruct); api.createData(vftableAddress, vftableStruct);
} }

6
gradle/support/fetchDependencies.gradle
View File

@ -191,9 +191,9 @@ ext.deps = [
destination: file("${DEPS_DIR}/Debugger-rmi-trace/") destination: file("${DEPS_DIR}/Debugger-rmi-trace/")
], ],
[ [
name: "Pybag-2.2.10-py3-none-any.whl", name: "Pybag-2.2.12-py3-none-any.whl",
url: "https://files.pythonhosted.org/packages/2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any.whl", url: "https://files.pythonhosted.org/packages/ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any.whl",
sha256: "81cf1e33dd667dd217dc56a123326796e6799b8569f2c6efb78c16375caf9b2b", sha256: "eda5ee6c4e873902981b7f525b42a02428b87c7368df2c5bdfe1ded0e6884126",
destination: file("${DEPS_DIR}/Debugger-agent-dbgeng/") destination: file("${DEPS_DIR}/Debugger-agent-dbgeng/")
], ],
[ [