[PATCH v2 1/2] client: Increase passphrase buffer to accommodate for nil byte

[PATCH v2 1/2] client: Increase passphrase buffer to accommodate for nil byte

[Tim Kourt]

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

---
 client/display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/display.c b/client/display.c
index cd17ad84..105d05cb 100644
--- a/client/display.c
+++ b/client/display.c
@@ -397,7 +397,7 @@ static void display_completion_matches(char **matches, int num_matches,
 
 static struct masked_input {
 	bool use_mask;
-	char passphrase[MAX_PASSPHRASE_LEN];
+	char passphrase[MAX_PASSPHRASE_LEN + 1];
 	uint8_t point;
 	uint8_t end;
 } masked_input;
@@ -453,7 +453,7 @@ done:
 
 static void reset_masked_input(void)
 {
-	memset(masked_input.passphrase, 0, MAX_PASSPHRASE_LEN);
+	memset(masked_input.passphrase, 0, MAX_PASSPHRASE_LEN + 1);
 	masked_input.point = 0;
 	masked_input.end = 0;
 }
-- 
2.13.6

[PATCH v2 2/2] client: Update rl_point to last known position

[Tim Kourt]

[-- Attachment #1: Type: text/plain, Size: 709 bytes --]

Keep cursor's position consistent when passphrase is reaching
its maximum by adding characters in the middle of the string

The use case is very rare as not many people will attempt to
modify the masked passphrase from the middle.
---
 client/display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/display.c b/client/display.c
index 105d05cb..10c87b2a 100644
--- a/client/display.c
+++ b/client/display.c
@@ -408,7 +408,9 @@ static void mask_input(void)
 		return;
 
 	if (rl_end > MAX_PASSPHRASE_LEN) {
-		rl_point = rl_end = MAX_PASSPHRASE_LEN;
+		rl_end = MAX_PASSPHRASE_LEN;
+		rl_point = masked_input.point;
+
 		goto set_mask;
 	}
 
-- 
2.13.6

Re: [PATCH v2 1/2] client: Increase passphrase buffer to accommodate for nil byte

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

Hi Tim,

On 10/29/19 6:12 PM, Tim Kourt wrote:
> ---
>   client/display.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 

Both applied, thanks

Regards,
-Denis