Merge pull request #225 from Zondax/fixes

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the minor version of this release
 APPVERSION_N=4
 # This is the patch version of this release
-APPVERSION_P=8
+APPVERSION_P=9

app/src/candid/nns_parser.c

@@ -147,6 +147,9 @@ __Z_INLINE parser_error_t readCommandSpawn(parser_context_t *ctx, candid_transac
         CHECK_PARSER_ERR(readCandidByte(ctx, &has_principal))
         if (has_principal) {
             CHECK_PARSER_ERR(readCandidByte(ctx, &val->command.spawn.new_controller.len))
+            if (val->command.spawn.new_controller.len > DFINITY_PRINCIPAL_LEN) {
+                return parser_unexpected_value;
+            }
             CHECK_PARSER_ERR(readCandidBytes(ctx, val->command.spawn.new_controller.ptr, val->command.spawn.new_controller.len))
         }
     }

app/src/parser_print_helper.c

@@ -164,10 +164,12 @@ parser_error_t page_principal_with_subaccount(const uint8_t *sender, uint16_t se
     uint16_t principalLen = sizeof(text);
     zxerr_t err = zxerr_unknown;
     err = crypto_principalToTextual(sender, senderLen, text_ptr, &principalLen);
+    // maximum length without separators is 53
     if (err != zxerr_ok || principalLen > 53) {
         return parser_unexpected_error;
     }
-    const uint8_t principalTextLen = (uint8_t)(principalLen + principalLen / 6);
+    // every 5 chars there's a separator, and last block has no separator after it
+    const uint8_t principalTextLen = (uint8_t)(principalLen + principalLen / 5 - (principalLen % 5 ? 0 : 1));
     for (uint8_t i = 5; i < principalTextLen; i += 6) {
         // two blocks separated with dash, 3rd with SEPARATOR
         if ((i + 1) % 18 == 0) err = inplace_insert_char(text_ptr, sizeof(text), i, SEPARATOR); // line break
@@ -176,8 +178,11 @@ parser_error_t page_principal_with_subaccount(const uint8_t *sender, uint16_t se
             return parser_unexpected_error;
         }
     }
-    // we are sure it's going to be up to 63
+    // we are sure it's going to be up to 63 (53 + 10)
     principalLen = (uint16_t)strnlen(text, sizeof(text));
+    if (principalLen > 63) {
+        return parser_unexpected_value;
+    }
     *(text_ptr + principalLen) = '-';
     text_ptr += principalLen + 1;