[MPlayer-cvslog] r35367 - trunk/parser-cfg.c

[reimar]

Author: reimar
Date: Tue Nov  6 23:05:26 2012
New Revision: 35367

Log:
Properly free resources even when encountering many
parse errors.

Modified:
   trunk/parser-cfg.c

Modified: trunk/parser-cfg.c
==============================================================================
--- trunk/parser-cfg.c	Tue Nov  6 22:59:59 2012	(r35366)
+++ trunk/parser-cfg.c	Tue Nov  6 23:05:26 2012	(r35367)
@@ -59,8 +59,8 @@ int m_config_parse_config_file(m_config_
 #define MAX_LINE_LEN	10000
 #define MAX_OPT_LEN	1000
 #define MAX_PARAM_LEN	1500
-	FILE *fp;
-	char *line;
+	FILE *fp = NULL;
+	char *line = NULL;
 	char opt[MAX_OPT_LEN + 1];
 	char param[MAX_PARAM_LEN + 1];
 	char c;		/* for the "" and '' check */
@@ -98,7 +98,6 @@ int m_config_parse_config_file(m_config_
 
 	if ((fp = fopen(conffile, "r")) == NULL) {
 	  mp_msg(MSGT_CFGPARSER,silent?MSGL_V:MSGL_ERR,"Failed to read %s: %s\n", conffile, strerror(errno));
-		free(line);
 		ret = silent ? 0 : -1;
 		goto out;
 	}
@@ -255,9 +254,9 @@ nextline:
 		;
 	}
 
-	free(line);
-	fclose(fp);
 out:
+	free(line);
+	if (fp) fclose(fp);
 	config->mode = prev_mode;
 	--recursion_depth;
 	return ret;