qi-hardware/antorcha
1
0
Fork 0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-01 07:17:31 +02:00
Code

tools/libtxt/font.c (free_image, free_font): allow NULL pointer

Browse Source
This commit is contained in:
Werner Almesberger 2012-06-30 12:59:50 -03:00
parent 350283375c
commit 6ffcd815f9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/libtxt/font.c
View File

@ -152,9 +152,11 @@ struct image *load_image(const char *name, const char **error)
void free_image(struct image *img) void free_image(struct image *img)
{ {
if (img) {
free(img->data); free(img->data);
free(img); free(img);
} }
}
/* ----- Font generation --------------------------------------------------- */ /* ----- Font generation --------------------------------------------------- */
@ -238,9 +240,11 @@ struct font *make_font(struct image *img, const char **error)
void free_font(struct font *font) void free_font(struct font *font)
{ {
if (font) {
free_image(font->img); free_image(font->img);
free(font); free(font);
} }
}
/* ----- Drawing on a canvas ----------------------------------------------- */ /* ----- Drawing on a canvas ----------------------------------------------- */