summaryrefslogtreecommitdiffstats
path: root/libvo/font_load.c
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-11 12:42:19 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-11 12:42:19 +0000
commit0a33aed66eb44089449d95f5633813b268b11797 (patch)
tree0fd7efce86c10b801fbb8a7d7aba00afe69b3a06 /libvo/font_load.c
parent2f212bafeef612f73f504bfb67f99f8e288786e4 (diff)
downloadmpv-0a33aed66eb44089449d95f5633813b268b11797.tar.bz2
mpv-0a33aed66eb44089449d95f5633813b268b11797.tar.xz
avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl@cs.colorado.edu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12794 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/font_load.c')
-rw-r--r--libvo/font_load.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c
index 22a9045e9b..e005f6ecac 100644
--- a/libvo/font_load.c
+++ b/libvo/font_load.c
@@ -245,10 +245,19 @@ while(fgets(sor,1020,f)){
}
}
printf("Syntax error in font desc: %s\n",sor);
+ free(desc);
+ fclose(f);
+ return NULL;
}
fclose(f);
+ if (first == 1) {
+ printf("%s is empty or a directory, ignoring\n", fname);
+ free(desc);
+ return NULL;
+ }
+
//printf("font: pos of U = %d\n",desc->start[218]);
for(i=0;i<=fontdb;i++){