ccandy
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor optimisation (avoid bogus valgrind complaint).

This commit is contained in:
Kim Woelders 2013-07-02 06:36:20 +02:00
parent ad756ccacf
commit 7514ec5276
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/font_load.c
View File

@ -35,7 +35,7 @@ static int font_flush_free_glyph_cb(Imlib_Hash * hash, const char *key,
ImlibFont *
imlib_font_load_joined(const char *fontname)
{
int j, k, size, faceidx;
int j, k, size, faceidx, namelen;
char *name, *file = NULL, *tmp;
ImlibFont *fn;
@ -65,13 +65,14 @@ imlib_font_load_joined(const char *fontname)
break;
}
namelen = j;
/* split name in front off */
name = malloc(j + 1);
memcpy(name, fontname, j);
name[j] = 0;
name = malloc(namelen + 1);
memcpy(name, fontname, namelen);
name[namelen] = 0;
/* find file if it exists */
tmp = malloc(strlen(name) + 4 + 1);
tmp = malloc(namelen + 4 + 1);
if (!tmp)
goto done;
@ -96,7 +97,7 @@ imlib_font_load_joined(const char *fontname)
{
for (j = 0; (j < fpath_num) && (!file); j++)
{
tmp = malloc(strlen(fpath[j]) + 1 + strlen(name) + 4 + 1);
tmp = malloc(strlen(fpath[j]) + 1 + namelen + 4 + 1);
if (!tmp)
goto done;