Skip to content

Fix resource leaks #39

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix resource leaks #39

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0e5d6a
Fix comment typo
sparist Oct 12, 2021
acb3905
Fix indentation in generated code
sparist Oct 12, 2021
3453ba4
Remove unused memory allocation
sparist Oct 12, 2021
0d5a33c
Fix GPUPipelineLayoutDescriptor constructor leak
sparist Oct 12, 2021
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
12 changes: 7 additions & 5 deletions generator/generators/descriptorDecoder.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ export function getDecodeStructureMember(structure, member, opts = DEFAULT_OPTS_
${padding}{
${padding} Napi::Array array = ${input.name}.Get("${member.name}").As<Napi::Array>();
${padding} uint32_t length = array.Length();
${padding} ${type.nativeType}* data = (${type.nativeType}*) malloc(length * sizeof(${type.nativeType}));
${padding} for (unsigned int ii = 0; ii < length; ++ii) {`;
// valdiate object
// validate object
if (type.isStructure) {
out += `\n${padding}if (!(array.Get(ii).IsObject())) {
out += `\n${padding} if (!(array.Get(ii).IsObject())) {
${padding} Napi::String type = Napi::String::New(value.Env(), "Type");
${padding} Napi::String message = Napi::String::New(value.Env(), "Expected 'Object' for '${structure.externalName}'.'${member.name}'");
${padding} device->throwCallbackError(type, message);
Expand All @@ -71,7 +70,7 @@ ${padding} }`;
// validate class
else if (type.isObject) {
let unwrapType = getExplortDeclarationName(type.nativeType);
out += `\n${padding}if (!(array.Get(ii).IsObject()) || !(array.Get(ii).As<Napi::Object>().InstanceOf(${unwrapType}::constructor.Value()))) {
out += `\n${padding} if (!(array.Get(ii).IsObject()) || !(array.Get(ii).As<Napi::Object>().InstanceOf(${unwrapType}::constructor.Value()))) {
${padding} Napi::String type = Napi::String::New(value.Env(), "Type");
${padding} Napi::String message = Napi::String::New(value.Env(), "Expected '${unwrapType}' for '${structure.externalName}'.'${member.name}'");
${padding} device->throwCallbackError(type, message);
Expand Down Expand Up @@ -332,7 +331,10 @@ function getDestroyStructureMember(structure, member) {
// no need to free
}
else if (type.isObject && type.isArray) {
// no need to free
out += `
if (descriptor.${member.name}) {
free((void*) const_cast<${nativeType}*>(descriptor.${member.name}));
}`;
}
else if (type.isStructure && !type.isArray) {
let exportType = getExplortDeclarationName(nativeType);
Expand Down