diff options
| author | lgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-26 20:28:09 +0000 |
|---|---|---|
| committer | lgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-26 20:28:09 +0000 |
| commit | 3bdf0810d74da672d4a00ea88a3187e4e80efc04 (patch) | |
| tree | 69c849e4d4cfdd1c9e824893bcbd89774ce6c5f4 /libvo/font_load.c | |
| parent | 5919d4a501068067492a02120b51970618ba3c1e (diff) | |
| download | mpv-3bdf0810d74da672d4a00ea88a3187e4e80efc04.tar.bz2 mpv-3bdf0810d74da672d4a00ea88a3187e4e80efc04.tar.xz | |
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
Diffstat (limited to 'libvo/font_load.c')
| -rw-r--r-- | libvo/font_load.c | 16 |
1 files 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]); |