mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 22:54:12 +02:00
Kellermorph
a16964c055
Deleting a cable and pressing Ctrl+Z twice leaves the cable out of the project while AddCableCommand still stands and still thinks it has to clean that cable up. The next edit of any kind makes the stack throw the undone commands away: ~RemoveCableCommand frees the cable, and ~AddCableCommand frees the same memory again. A plain build hides it, AddressSanitizer reports it as a heap-use-after-free in addcablecommand.cpp (blocking review comment by ispyisail). AddCableCommand now holds the cable as a QPointer, which is what RemoveCableCommand already did: whoever of the two runs first frees it, the other one sees a null pointer and has nothing left to do, in either order of destruction. The destructor also stopped dereferencing project() without checking it, which it did on that very line. Covered by tst_cableundointegration, a probe linked against the application's objects the way the other integration probes are. It draws a cable, deletes it, undoes twice and pushes a further edit -- the sequence which used to crash. Verified in both directions: with the raw pointer the probe dies with SIGSEGV inside ~AddCableCommand called from QUndoStack::push, with the QPointer it prints its PASS line.
61 lines
2.8 KiB
Python
Executable File
61 lines
2.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Link the cable undo integration probe using an existing Ninja app build.
|
|
|
|
Reuses app objects without duplicating the app or introducing a core-library
|
|
refactor. No application source or existing executable is replaced. The
|
|
generated manifest, probe binary, reports and export fixtures stay in build/.
|
|
"""
|
|
import argparse
|
|
import pathlib
|
|
import re
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument('--build', required=True)
|
|
parser.add_argument('--binary', required=True)
|
|
parser.add_argument('--source', required=True)
|
|
parser.add_argument('--fixture', required=True)
|
|
args = parser.parse_args()
|
|
build = pathlib.Path(args.build).resolve()
|
|
binary = pathlib.Path(args.binary).resolve()
|
|
source = pathlib.Path(args.source).resolve()
|
|
fixture = pathlib.Path(args.fixture).resolve()
|
|
manifest = (build / 'build.ninja').read_text(encoding='utf-8')
|
|
match = re.search(r'^build (\S*?/sources/main\.cpp\.(?:obj|o)):', manifest, re.MULTILINE)
|
|
if not match:
|
|
sys.exit('Cannot find the application main object in the Ninja build.')
|
|
main_object = match.group(1)
|
|
probe_object = main_object.replace('main.cpp.', 'cable_undo_probe.cpp.')
|
|
probe_binary = binary.with_name('cable_undo_probe' + binary.suffix)
|
|
def escape(path):
|
|
return pathlib.Path(path).as_posix().replace('$', '$$').replace(':', '$:').replace(' ', '$ ')
|
|
main_source = source.parents[2] / 'sources' / 'main.cpp'
|
|
manifest = manifest.replace(main_object, probe_object)
|
|
manifest = manifest.replace(escape(main_source), escape(source))
|
|
if binary.suffix:
|
|
manifest = manifest.replace(binary.name, probe_binary.name)
|
|
else:
|
|
old_target = escape(binary.name if binary.parent == build else binary)
|
|
new_target = escape(probe_binary.name if probe_binary.parent == build else probe_binary)
|
|
manifest = manifest.replace('build ' + old_target + ':', 'build ' + new_target + ':')
|
|
old_file = binary.name if binary.parent == build else binary.as_posix()
|
|
new_file = probe_binary.name if probe_binary.parent == build else probe_binary.as_posix()
|
|
manifest = re.sub(r'^ TARGET_FILE = ' + re.escape(old_file) + r'$',
|
|
' TARGET_FILE = ' + new_file, manifest, flags=re.MULTILINE)
|
|
probe_manifest = build / 'cable-undo-probe.ninja'
|
|
probe_manifest.write_text(manifest, encoding='utf-8')
|
|
ninja = shutil.which('ninja')
|
|
if not ninja:
|
|
sys.exit('Ninja is required for the integration probe.')
|
|
target = probe_binary.name if probe_binary.parent == build else str(probe_binary)
|
|
subprocess.run([ninja, '-C', str(build), '-f', probe_manifest.name, target], check=True)
|
|
output = build / 'cable-undo'
|
|
output.mkdir(exist_ok=True)
|
|
report = output / 'results.txt'
|
|
result = subprocess.run([str(probe_binary), str(fixture), str(report), str(output)], timeout=90)
|
|
if report.exists():
|
|
print(report.read_text(encoding='utf-8', errors='replace'))
|
|
sys.exit(result.returncode)
|