Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-02-05 11:05:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-8917_mildsunrise_pyghidra-jvmargs'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-02-03 12:28:37 -05:00
parent 644a0987f1 3cda473a62
commit a945505ee0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/PyGhidra/src/main/py/README.md
View File

@@ -573,6 +573,8 @@ __3.1.0__
all of its imported modules again. This default behavior can be disabled by setting the
`pyghidra.sys.modules.restore.disable` Java system property to `true`, which can be done in the
`support/launch.properties` file.
* `ghidra_launch.py` now correctly prioritizes user-defined JVM properties higher than those defined
in `support/launch.properties`.
__3.0.2__
* Fixed an issue that prevented [`pyghidra.analysis_properties()`](#pyghidraanalysis_properties)

2
Ghidra/Features/PyGhidra/src/main/py/src/pyghidra/ghidra_launch.py
View File

@@ -113,6 +113,6 @@ if __name__ == "__main__":
_, remaining = parser.parse_known_args(namespace=args)
launcher = GhidraLauncher(False, args.class_name, args.gui, install_dir=args.install_dir)
launcher.vm_args = args.jvm_args + launcher.vm_args
launcher.vm_args = launcher.vm_args + args.jvm_args
launcher.args = remaining
launcher.start()