From 90b4f33965b9be2188af2e7bc223b88744a5c992 Mon Sep 17 00:00:00 2001
From: Mariusz Glebocki <mglb@arccos-1.net>
Date: Sat, 4 Jan 2020 18:21:30 +0100
Subject: [PATCH] Fix token buffer indexing

BUG: 415249
BUG: 415463
---
 src/Vt102Emulation.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 6245c925..0779015a 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -265,8 +265,9 @@ void Vt102Emulation::addArgument()
 
 void Vt102Emulation::addToCurrentToken(uint cc)
 {
+    tokenBufferPos = qMin(tokenBufferPos, MAX_TOKEN_LENGTH - 1);
     tokenBuffer[tokenBufferPos] = cc;
-    tokenBufferPos = qMin(tokenBufferPos + 1, MAX_TOKEN_LENGTH - 1);
+    tokenBufferPos++;
 }
 
 // Character Class flags used while decoding