[MPlayer-cvslog] r35346 - trunk/sub/font_load.c

[reimar]

Author: reimar
Date: Mon Nov  5 21:42:00 2012
New Revision: 35346

Log:
Simplify, avoid crash when malloc/calloc fails.

Modified:
   trunk/sub/font_load.c

Modified: trunk/sub/font_load.c
==============================================================================
--- trunk/sub/font_load.c	Mon Nov  5 21:39:52 2012	(r35345)
+++ trunk/sub/font_load.c	Mon Nov  5 21:42:00 2012	(r35346)
@@ -67,7 +67,6 @@ err_out:
 font_desc_t* read_font_desc(const char* fname,float factor,int verbose){
 unsigned char sor[1024];
 unsigned char sor2[1024];
-font_desc_t *desc;
 FILE *f = NULL;
 char *dn;
 //struct stat fstate;
@@ -77,8 +76,8 @@ int chardb=0;
 int fontdb=-1;
 int first=1;
 
-desc=malloc(sizeof(font_desc_t));if(!desc) goto fail_out;
-memset(desc,0,sizeof(font_desc_t));
+font_desc_t *desc=calloc(1, sizeof(*desc));
+if(!desc) goto fail_out;
 
 f=fopen(fname,"rt");if(!f){ mp_msg(MSGT_OSD, MSGL_V, "font: can't open file: %s\n",fname); goto fail_out;}
 
@@ -344,9 +343,11 @@ return desc;
 fail_out:
   if (f)
     fclose(f);
-  free(desc->fpath);
-  free(desc->name);
-  free(desc);
+  if (desc) {
+    free(desc->fpath);
+    free(desc->name);
+    free(desc);
+  }
   return NULL;
 }