Skip to content

Fix memory leak when reusing DmtxEncode across multiple encode calls #64

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
94xhn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory leak when reusing DmtxEncode across multiple encode calls #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 12 additions & 0 deletions dmtxencode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ dmtxEncodeGetProp(DmtxEncode *enc, int prop)
enc->region.mappingRows = dmtxGetSymbolAttribute(DmtxSymAttribMappingMatrixRows, sizeIdx);
enc->region.mappingCols = dmtxGetSymbolAttribute(DmtxSymAttribMappingMatrixCols, sizeIdx);

/* Free any message left over from a previous call on this DmtxEncode
before allocating a new one, to avoid leaking it (see issue #40) */
dmtxMessageDestroy(&(enc->message));

/* Allocate memory for message and array */
enc->message = dmtxMessageCreate(sizeIdx, DmtxFormatMatrix);
enc->message->padCount = 0; /* XXX this needs to be added back */
Expand All @@ -233,6 +237,14 @@ dmtxEncodeGetProp(DmtxEncode *enc, int prop)
return DmtxFail;
}

/* Free any image left over from a previous call on this DmtxEncode
before allocating a new one, to avoid leaking it (see issue #40) */
if(enc->image != NULL && enc->image->pxl != NULL) {
free(enc->image->pxl);
enc->image->pxl = NULL;
}
dmtxImageDestroy(&(enc->image));

enc->image = dmtxImageCreate(pxl, width, height, enc->pixelPacking);
if(enc->image == NULL) {
perror("image malloc error");
Expand Down