Commit 6f58332f3ab04f910103b945348b6a0a314c1793

Russell Belfer 2012-12-20T16:15:02

Fix use of uninitialized variable

diff --git a/src/stash.c b/src/stash.c
index e67f703..dbd626a 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -401,8 +401,8 @@ static int prepare_worktree_commit_message(
 	git_buf buf = GIT_BUF_INIT;
 	int error;
 
-	if (git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg)) < 0)
-		return -1;
+	if ((error = git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg))) < 0)
+		return error;
 
 	git_buf_clear(msg);
 
@@ -419,7 +419,7 @@ static int prepare_worktree_commit_message(
 		git_buf_printf(msg, ": %s\n", user_message);
 	}
 
-	error = git_buf_oom(msg) || git_buf_oom(&buf) ? -1 : 0;
+	error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0;
 
 cleanup:
 	git_buf_free(&buf);