Commit Diff

Commit:
4f46fcf8880d657db0e339f7e3f0c72dc1dad27a
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
fix use of uninitialized variable in update_blob spotted by smatch. ok millert@
Actions:
Patch | Tree
commit - 9f6f4b2b2a23de4b38b50c2e7e3c00ffb8e8f56e
commit + 4f46fcf8880d657db0e339f7e3f0c72dc1dad27a
blob - f9dab4aa7fa61a15a37496a872943d7ba462fc69
blob + bcfa1a05fd35d1354207a86c2d0bd1c610dd3877
--- lib/worktree.c
+++ lib/worktree.c
@@ -1917,7 +1917,7 @@ update_blob(struct got_worktree *worktree,
 	unsigned char status = GOT_STATUS_NO_CHANGE;
 	struct stat sb;
 	int fd1 = -1, fd2 = -1;
-	int update_timestamps;
+	int update_timestamps = 0;
 
 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
 		return got_error_from_errno("asprintf");
@@ -2041,7 +2041,6 @@ update_blob(struct got_worktree *worktree,
 		goto done;
 
 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
-		int update_timestamps;
 		struct got_blob_object *blob2 = NULL;
 		char *label_orig = NULL;
 		if (got_fileindex_entry_has_blob(ie)) {