m/ptouch-print
1
0
Fork 0
mirror of https://git.familie-radermacher.ch/linux/ptouch-print.git synced 2025-05-13 23:32:59 +00:00
Code Issues Releases Activity

fix double free

Browse Source
This commit is contained in:
Brett Foster 2019-05-11 13:43:08 -07:00 committed by Dominic Radermacher
parent fda7848075
commit fa70a4eb4b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ptouch-print.c
View File

@ -453,6 +453,7 @@ int main(int argc, char *argv[])
im=image_load(argv[++i]);
out=img_append(out, im);
gdImageDestroy(im);
im = NULL;
} else if (strcmp(&argv[i][1], "-text") == 0) {
for (lines=0; (lines < MAX_LINES) && (i < argc); lines++) {
if ((i+1 >= argc) || (argv[i+1][0] == '-')) {
@ -468,11 +469,13 @@ int main(int argc, char *argv[])
}
out=img_append(out, im);
gdImageDestroy(im);
im = NULL;
}
} else if (strcmp(&argv[i][1], "-cutmark") == 0) {
im=img_cutmark(tape_width);
out=img_append(out, im);
gdImageDestroy(im);
im = NULL;
} else {
usage(argv[0]);
}
@ -489,7 +492,9 @@ int main(int argc, char *argv[])
}
gdImageDestroy(out);
}
gdImageDestroy(im);
if (im != NULL) {
gdImageDestroy(im);
}
ptouch_close(ptdev);
libusb_exit(NULL);
return 0;