From b23f7bfb1d9227cd97d73aeec593b156eaa51e4a Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sun, 27 Jun 2021 16:30:43 +0200
Subject: [PATCH] :bug: Fix password expansion

---
 Source/codec.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/codec.cpp b/Source/codec.cpp
index d828c8d97..37ece4922 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -31,11 +31,12 @@ static void CodecInitKey(const char *pszPassword)
 		notch = randState >> 16; // Downcasting to char keeps the 2 least-significant bytes
 	}
 
-	char pw[64];
-	for (std::size_t i = 0; i < sizeof(pw); i++) {
-		if (pszPassword[i] == '\0')
-			i = 0;
-		pw[i] = pszPassword[i];
+	char pw[64]; // Repeat password until 64 char long
+	std::size_t j = 0;
+	for (std::size_t i = 0; i < sizeof(pw); i++, j++) {
+		if (pszPassword[j] == '\0')
+			j = 0;
+		pw[i] = pszPassword[j];
 	}
 
 	char digest[SHA1HashSize];