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

Jump to bottom

fix memory leak in file zbarimg/zbarimg.c #300

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix memory leak in file zbarimg/zbarimg.c #300

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
52 changes: 38 additions & 14 deletions zbarimg/zbarimg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,22 @@ static int scan_image(const char *filename)

int found = 0;
MagickWand *images = NewMagickWand();
if (!images)
return (-1);

// default is a measly 72dpi for pdf
MagickSetResolution(images, 900, 900);

if (!MagickReadImage(images, filename) && dump_error(images))
return (-1);
goto error;

unsigned seq, n = MagickGetNumberImages(images);
for (seq = 0; seq < n; seq++) {
if (exit_code == 3)
return (-1);
goto error;

if (!MagickSetImageIndex(images, seq) && dump_error(images))
return (-1);
goto error;

zbar_image_t *zimage = zbar_image_create();
assert(zimage);
Expand All @@ -195,11 +197,16 @@ static int scan_image(const char *filename)
// (but only if it's a color image)
size_t bloblen = width * height;
unsigned char *blob = malloc(bloblen);
if (!blob)
goto error;

zbar_image_set_data(zimage, blob, bloblen, zbar_image_free_data);

if (!MagickGetImagePixels(images, 0, 0, width, height, "I", CharPixel,
blob))
return (-1);
blob)) {
free(blob);
goto error;
}

if (xmllvl == 1) {
xmllvl++;
Expand Down Expand Up @@ -229,7 +236,8 @@ static int scan_image(const char *filename)
if (len &&
fwrite(zbar_symbol_get_data(sym), len, 1, stdout) != 1) {
exit_code = 1;
return (-1);
free(blob);
goto error;
}
} else {
if (xmllvl < 3) {
Expand All @@ -239,7 +247,8 @@ static int scan_image(const char *filename)
zbar_symbol_xml(sym, &xmlbuf, &xmlbuflen);
if (fwrite(xmlbuf, xmlbuflen, 1, stdout) != 1) {
exit_code = 1;
return (-1);
free(blob);
goto error;
}
}
found++;
Expand Down Expand Up @@ -280,6 +289,10 @@ static int scan_image(const char *filename)

DestroyMagickWand(images);
return (0);

error:
DestroyMagickWand(images);
return (-1);
}

int usage(int rc, const char *msg, const char *arg)
Expand Down Expand Up @@ -421,7 +434,7 @@ int main(int argc, const char *argv[])

if (zbar_processor_init(processor, NULL, display)) {
zbar_processor_error_spew(processor, 0);
return (1);
goto error;
}

if (xmllvl > 0) {
Expand All @@ -445,14 +458,17 @@ int main(int argc, const char *argv[])
#endif

if (arg[0] != '-' || !arg[1]) {
if (scan_image(arg))
if (scan_image(arg)) {
zbar_processor_destroy(processor);
DestroyMagick();
return (exit_code);
}
} else if (arg[1] != '-')
for (j = 1; arg[j]; j++) {
if (arg[j] == 'S') {
if ((arg[++j]) ? parse_config(arg + j, "-S") :
parse_config(argv[++i], "-S"))
return (1);
parse_config(argv[++i], "-S"))
goto error;
break;
}
switch (arg[j]) {
Expand All @@ -471,16 +487,19 @@ int main(int argc, const char *argv[])

else if (!strcmp(arg, "--set")) {
if (parse_config(argv[++i], "--set"))
return (1);
goto error;
} else if (!strncmp(arg, "--set=", 6)) {
if (parse_config(arg + 6, "--set="))
return (1);
goto error;
} else if (!strcmp(arg, "--"))
break;
}
for (i++; i < argc; i++)
if (scan_image(argv[i]))
if (scan_image(argv[i])) {
zbar_processor_destroy(processor);
DestroyMagick();
return (exit_code);
}

/* ignore quit during last image */
if (exit_code == 3)
Expand Down Expand Up @@ -552,4 +571,9 @@ int main(int argc, const char *argv[])
zbar_processor_destroy(processor);
DestroyMagick();
return (exit_code);

error:
zbar_processor_destroy(processor);
DestroyMagick();
return (1);
}