Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed crash in QMetaObject creation #57

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Fixed crash in QMetaObject creation #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e0923
Fixed crash in QMetaObject creation
filcuc Feb 5, 2025
ec9d8b6
Use newSeqOfCap during QMetaObject creation
filcuc Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions src/nimqml/private/qmetaobject.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,37 @@ proc setup(superClass: QMetaObject,
signals: seq[SignalDefinition],
slots: seq[SlotDefinition],
properties: seq[PropertyDefinition]): DosQMetaObject =
var dosParameters: seq[seq[DosParameterDefinition]] = @[]
var dosSignalParameters = newSeqOfCap[seq[DosParameterDefinition]](signals.len)
for i in 0..<signals.len:
var parameters: seq[DosParameterDefinition] = @[]
var parameters = newSeqOfCap[DosParameterDefinition](signals[i].parameters.len)
for p in signals[i].parameters:
parameters.add(DosParameterDefinition(name: p.name.cstring, metaType: p.metaType.cint))
dosParameters.add(parameters)
dosSignalParameters.add(parameters)

var dosSignals: seq[DosSignalDefinition] = @[]
var dosSignals = newSeqOfCap[DosSignalDefinition](signals.len)
for i in 0..<signals.len:
let parametersCount = dosParameters[i].len.cint
let parametersCount = dosSignalParameters[i].len.cint
let name = signals[i].name.cstring
let dosSignal = DosSignalDefinition(name: name, parametersCount: parametersCount, parameters: if parametersCount > 0: dosParameters[i][0].unsafeAddr else: nil)
let dosSignal = DosSignalDefinition(name: name, parametersCount: parametersCount, parameters: if parametersCount > 0: dosSignalParameters[i][0].unsafeAddr else: nil)
dosSignals.add(dosSignal)

var dosSlots: seq[DosSlotDefinition] = @[]
var dosSlotParameters = newSeqOfCap[seq[DosParameterDefinition]](slots.len)
for i in 0..<slots.len:
let name = slots[i].name.cstring
let returnMetaType = slots[i].returnMetaType.cint
let parametersCount = slots[i].parameters.len.cint
var parameters: seq[DosParameterDefinition] = @[]
var parameters = newSeqOfCap[DosParameterDefinition](slots[i].parameters.len)
for p in slots[i].parameters:
parameters.add(DosParameterDefinition(name: p.name.cstring, metaType: p.metaType.cint))
dosSlotParameters.add(parameters)

var dosSlots = newSeqOfCap[DosSlotDefinition](slots.len)
for i in 0..<slots.len:
let parametersCount = dosSlotParameters[i].len.cint
let name = slots[i].name.cstring
let returnMetaType = slots[i].returnMetaType.cint
let dosSlot = DosSlotDefinition(name: name, returnMetaType: returnMetaType,
parametersCount: parametersCount, parameters: if parameters.len > 0: parameters[0].unsafeAddr else: nil)
dosParameters.add(parameters)
parametersCount: parametersCount, parameters: if parametersCount > 0: dosSlotParameters[i][0].unsafeAddr else: nil)
dosSlots.add(dosSlot)

var dosProperties: seq[DosPropertyDefinition] = @[]
var dosProperties = newSeqOfCap[DosPropertyDefinition](properties.len)
for i in 0..<properties.len:
let name = properties[i].name.cstring
let propertyMetaType = properties[i].propertyMetaType.cint
Expand Down
Loading