Merge branch 'v0.17.x'

2013-01-03 22:53:53 +01:00
parent 59400d38a9 9761abf3b5
commit 6837e5a6a0
6 changed files with 84 additions and 14 deletions
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -217,12 +217,12 @@ parse_cmdline(int argc, char **argv, struct options *options,
 				if(g_file_test(system_path,
 						G_FILE_TEST_IS_REGULAR)) {
 					ret = config_read_file(system_path,error_r);
+					g_free(system_path);
 					break;
-				}
-				++i;;
+				} else
+					g_free(system_path);
+				++i;
 			}
-			g_free(system_path);
-			g_free(&system_config_dirs);
 		}
 #else /* G_OS_WIN32 */
 		char *path2;