Merge 9d3498f01e into ef5859437a

core/git-access.c

@@ -161,9 +161,7 @@ char *get_local_dir(const char *url, const char *branch)
 static char *move_local_cache(struct git_info *info)
 {
 	char *old_path = get_local_dir(info->url, info->branch);
-	char *new_path = move_away(old_path);
+	return move_away(old_path);
-	free(old_path);
-	return new_path;
 }
 
 static int check_clean(const char *path, unsigned int status, void *payload)

core/parse-xml.c

@@ -2261,7 +2261,7 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct divelog *log)
 	/* Recording the starting battery status to extra data */
 	if (battery_start.volt1) {
 		size_t stringsize = snprintf(NULL, 0, "%dmV (%d%%)", battery_start.volt1, battery_start.percent1) + 1;
-		char *ptr = malloc(stringsize);
+		char *ptr = malloc(size);
 
 		if (ptr) {
 			snprintf(ptr, stringsize, "%dmV (%d%%)", battery_start.volt1, battery_start.percent1);