[Mplayer-cvslog] CVS: main/libvo font_load.c,1.27,1.28

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv28368/libvo

Modified Files:
	font_load.c 
Log Message:
avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl at cs.colorado.edu>

Index: font_load.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- font_load.c	18 Jun 2004 13:51:45 -0000	1.27
+++ font_load.c	11 Jul 2004 12:42:19 -0000	1.28
@@ -245,10 +245,19 @@
       }
   }
   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++){