From 3bdf0810d74da672d4a00ea88a3187e4e80efc04 Mon Sep 17 00:00:00 2001 From: lgb Date: Mon, 26 Mar 2001 20:28:09 +0000 Subject: [PATCH] Search font files in ~/.mplayer/font/ instead of current dir git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@218 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/font_load.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libvo/font_load.c b/libvo/font_load.c index 4081240ac2..8a5ed07350 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -109,8 +109,12 @@ while(fgets(sor,1020,f)){ if(strcmp(section,"[files]")==0){ if(pdb==2 && strcmp(p[0],"alpha")==0){ - char *cp=get_path("font/"); - char *cp2=malloc(strlen(cp)+strlen(p[1])+1); + char *cp,*cp2; + if (!(cp=get_path("font/"))) return NULL; + if (!(cp2=malloc(strlen(cp)+strlen(p[1])+1))) { + free(cp); + return NULL; + } sprintf(cp2,"%s%s",cp,p[1]); if(!((desc->pic_a[fontdb]=load_raw(cp2)))){ printf("Can't load font bitmap: %s\n",p[1]); @@ -123,8 +127,12 @@ while(fgets(sor,1020,f)){ continue; } if(pdb==2 && strcmp(p[0],"bitmap")==0){ - char *cp=get_path("font/"); - char *cp2=malloc(strlen(cp)+strlen(p[1])+1); + char *cp,*cp2; + if (!(cp=get_path("font/"))) return NULL; + if (!(cp2=malloc(strlen(cp)+strlen(p[1])+1))) { + free(cp); + return NULL; + } sprintf(cp2,"%s%s",cp,p[1]); if(!((desc->pic_b[fontdb]=load_raw(cp2)))){ printf("Can't load font bitmap: %s\n",p[1]);