Fixing HOTP bug Nitrokey#27

Signed-off-by: Szczepan Zalega <[email protected]>
szszszsz · Mar 30, 2016 · 66b4b5c · 66b4b5c
1 parent f259faa
commit 66b4b5c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
@@ -1939,12 +1939,18 @@ QByteArray muiFromGUI = (ui->muiEdit->text ().toLatin1 ());
 
         slot->tokenID[12] = ui->keyboardComboBox->currentIndex () & 0xFF;
 
-QByteArray counterFromGUI = QByteArray (ui->counterEdit->text ().toLatin1 ());
+        bool conversionSuccess = false; //TODO check for error from conversion
+        uint64_t counterFromGUI =
+            ui->counterEdit->text().toLatin1().toLongLong(&conversionSuccess);
 
         memset (slot->counter, 0, 8);
 
-        if (0 != counterFromGUI.length ())
-            memcpy (slot->counter, counterFromGUI.data (), counterFromGUI.length ());
+        if (0 !=ui->counterEdit->text().toLatin1().length () && conversionSuccess){
+            memcpy (slot->counter, &counterFromGUI, //FIXME check for little endian / big endian conversion
+                    sizeof counterFromGUI);
+        }else{
+            csApplet->warningBox (tr ("Counter data not copied (setting to 0)"));
+        }
 
         slot->config = 0;