Fix core.download_file() creating empty files on HTTP error

rubenwardy · rubenwardy · commit 9a071d66a59b · 2019-02-03T17:31:28.000Z
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
@@ -530,7 +530,6 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
 {
 #if USE_CURL
 	std::ofstream target_file(target.c_str(), std::ios::out | std::ios::binary);
-
 	if (!target_file.good()) {
 		return false;
 	}
@@ -543,6 +542,8 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
 	httpfetch_sync(fetch_request, fetch_result);
 
 	if (!fetch_result.succeeded) {
+		target_file.close();
+		fs::DeleteSingleFileOrEmptyDirectory(target);
 		return false;
 	}
 	target_file << fetch_result.data;

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,6 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)`
`530`	`530`	`{`
`531`	`531`	`#if USE_CURL`
`532`	`532`	`std::ofstream target_file(target.c_str(), std::ios::out \| std::ios::binary);`
`533`		`-`
`534`	`533`	`if (!target_file.good()) {`
`535`	`534`	`return false;`
`536`	`535`	`}`
`@@ -543,6 +542,8 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)`
`543`	`542`	`httpfetch_sync(fetch_request, fetch_result);`
`544`	`543`
`545`	`544`	`if (!fetch_result.succeeded) {`
	`545`	`+ target_file.close();`
	`546`	`+ fs::DeleteSingleFileOrEmptyDirectory(target);`
`546`	`547`	`return false;`
`547`	`548`	`}`
`548`	`549`	`target_file << fetch_result.data;`