fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-08 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

om: Fix memory leaks on get_font_name error paths.

Browse source 
While at it, remove unneeded check for NULL before Xfree.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Ander Conselvan de Oliveira 2011-03-25 14:47:35 +02:00
parent 7c362e275c
commit ac1e2bff71
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/om/generic/omGeneric.c
View file

@ -575,7 +575,7 @@ get_rotate_fontname(
}
if(field_num < CHARSET_ENCODING_FIELD)
return NULL;
goto free_pattern;
/* Pixel Size field : fields[6] */
for(ptr = fields[PIXEL_SIZE_FIELD - 1] ; ptr && *ptr; ptr++) {
@ -584,9 +584,7 @@ get_rotate_fontname(
strcpy(pattern, font_name);
return(pattern);
}
if(pattern)
Xfree(pattern);
return NULL;
goto free_pattern;
}
}
pixel_size = atoi(fields[PIXEL_SIZE_FIELD - 1]);
@ -605,11 +603,11 @@ get_rotate_fontname(
/* Max XLFD length is 255 */
if (len > XLFD_MAX_LEN)
return NULL;
goto free_pattern;
rotate_font_ptr = (char *)Xmalloc(len + 1);
if(!rotate_font_ptr)
return NULL;
goto free_pattern;
rotate_font_ptr[0] = '\0';
@ -619,8 +617,8 @@ get_rotate_fontname(
strcat(rotate_font_ptr, fields[field_num]);
}
if(pattern)
Xfree(pattern);
free_pattern:
Xfree(pattern);
return rotate_font_ptr;
}