notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mem leak: both textdir() and uppercase() allocate

Browse source
This commit is contained in:
Albert Cahalan 2004-12-28 05:15:14 +00:00
parent 9f23f1d24d
commit f4435ebd75
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tuxpaint.c
View file

@ -6945,27 +6945,21 @@ static void setup(int argc, char * argv[])
/* Render a button label using the appropriate string/font: */ /* Render a button label using the appropriate string/font: */
static SDL_Surface * do_render_button_label(const char * const label) static SDL_Surface * do_render_button_label(const char * const label)
{ {
char * str;
SDL_Surface * tmp_surf, * surf; SDL_Surface * tmp_surf, * surf;
SDL_Color black = {0, 0, 0, 0}; SDL_Color black = {0, 0, 0, 0};
TTF_Font * myfont = small_font;
if (need_own_font && locale_font != NULL && if (need_own_font && strcmp(gettext(label), label))
strcmp(gettext(label), label) != 0) myfont = locale_font;
{ char *td_str = textdir(gettext(label));
tmp_surf = TTF_RenderUTF8_Blended(locale_font, textdir(gettext(label)), black); char *upstr = uppercase(td_str);
surf = thumbnail(tmp_surf, min(48, tmp_surf->w), tmp_surf->h, 0); free(td_str);
} tmp_surf = TTF_RenderUTF8_Blended(myfont, upstr, black);
else free(upstr);
{ surf = thumbnail(tmp_surf, min(48, tmp_surf->w), tmp_surf->h, 0);
str = uppercase(textdir(gettext(label))); SDL_FreeSurface(tmp_surf);
tmp_surf = TTF_RenderUTF8_Blended(small_font, str, black);
surf = thumbnail(tmp_surf, min(48, tmp_surf->w), tmp_surf->h, 0);
free(str);
SDL_FreeSurface(tmp_surf);
}
return surf; return surf;
} }