nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libi3: free previous font on font load 

When loading a new font with `load_font`, free the previously loaded
font with `free_font`.

If no font is loaded, `free_font` will simply return (instead of
crashing because of a double free).
This commit is contained in:
Tony Crisci 2015-02-10 15:11:40 -05:00
parent d38d2dc3e3
commit e91a9174e2
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libi3.h
View File

@ -290,7 +290,8 @@ uint32_t get_mod_mask_for(uint32_t keysym,
/** /**
* Loads a font for usage, also getting its height. If fallback is true, * Loads a font for usage, also getting its height. If fallback is true,
* the fonts 'fixed' or '-misc-*' will be loaded instead of exiting. * the fonts 'fixed' or '-misc-*' will be loaded instead of exiting. If any
* font was previously loaded, it will be freed.
* *
*/ */
i3Font load_font(const char *pattern, const bool fallback); i3Font load_font(const char *pattern, const bool fallback);
@ -302,7 +303,8 @@ i3Font load_font(const char *pattern, const bool fallback);
void set_font(i3Font *font); void set_font(i3Font *font);
/** /**
* Frees the resources taken by the current font. * Frees the resources taken by the current font. If no font was previously
* loaded, it simply returns.
* *
*/ */
void free_font(void); void free_font(void);

15
libi3/font.c
View File

@ -160,10 +160,14 @@ static int predict_text_width_pango(const char *text, size_t text_len) {
/* /*
* Loads a font for usage, also getting its metrics. If fallback is true, * Loads a font for usage, also getting its metrics. If fallback is true,
* the fonts 'fixed' or '-misc-*' will be loaded instead of exiting. * the fonts 'fixed' or '-misc-*' will be loaded instead of exiting. If any
* font was previously loaded, it will be freed.
* *
*/ */
i3Font load_font(const char *pattern, const bool fallback) { i3Font load_font(const char *pattern, const bool fallback) {
/* if any font was previously loaded, free it now */
free_font();
i3Font font; i3Font font;
font.type = FONT_TYPE_NONE; font.type = FONT_TYPE_NONE;
@ -257,10 +261,15 @@ void set_font(i3Font *font) {
} }
/* /*
* Frees the resources taken by the current font. * Frees the resources taken by the current font. If no font was previously
* loaded, it simply returns.
* *
*/ */
void free_font(void) { void free_font(void) {
/* if there is no saved font, simply return */
if (savedFont == NULL)
return;
free(savedFont->pattern); free(savedFont->pattern);
switch (savedFont->type) { switch (savedFont->type) {
case FONT_TYPE_NONE: case FONT_TYPE_NONE:
@ -283,6 +292,8 @@ void free_font(void) {
assert(false); assert(false);
break; break;
} }
savedFont = NULL;
} }
/* /*