Merge pull request #50 from Zondax/fix_hex2str

Fix hex2str

Author: chcmedeiros

include/zxformat.h

@@ -21,7 +21,6 @@ extern "C" {
 
 #include "zxmacros.h"
 #include "zxerror.h"
-#include "stdlib.h"
 
 #define IS_PRINTABLE(c) (c >= 0x20 && c <= 0x7e)
 
@@ -309,11 +308,11 @@ __Z_INLINE uint32_t hexstr_to_array(uint8_t *dst, uint16_t dstLen, const char *s
     }
 
     for (size_t i = 0; i < srcLen/2; i++) {
-        char byte_string[3];
-        byte_string[0] = src[i*2];
-        byte_string[1] = src[i*2 + 1];
-        byte_string[2] = '\0';
-        dst[i] = (uint8_t) strtol(byte_string, NULL, 16);
+        uint8_t ch0 = src[2 * i];
+        uint8_t ch1 = src[2 * i + 1];
+        uint8_t nib0 = (ch0 & 0xF) + (ch0 >> 6) | ((ch0 >> 3) & 0x8);
+        uint8_t nib1 = (ch1 & 0xF) + (ch1 >> 6) | ((ch1 >> 3) & 0x8);
+        dst[i] = (nib0 << 4) | nib1;
     }
 
   return srcLen/2;

include/zxversion.h

@@ -17,4 +17,4 @@
 
 #define ZXLIB_MAJOR     16
 #define ZXLIB_MINOR     0
-#define ZXLIB_PATCH     1
+#define ZXLIB_PATCH     2

tests/zxformat.cpp

@@ -94,4 +94,59 @@ namespace {
         EXPECT_STREQ(buffer, "ERR???");
     }
 
+    TEST(FORMAT, array2hexstr_1) {
+        uint8_t s[] = {0x12,0x34,0x56,0x78};
+        char data[10];
+
+        auto length = array_to_hexstr(data, sizeof(data), s, sizeof(s));
+
+        EXPECT_STREQ(data, "12345678");
+    }
+
+    TEST(FORMAT, array2hexstr_2) {
+        uint8_t s[] = {0xFA, 0x5D, 0x34, 0x87};
+        char data[10];
+
+        auto length = array_to_hexstr(data, sizeof(data), s, sizeof(s));
+
+        EXPECT_STREQ(data, "FA5D3487");
+    }
+
+    TEST(FORMAT, array2hexstr_small_buffer) {
+        uint8_t s[] = {0xFA, 0x5D, 0x34, 0x87};
+        char data[4];
+
+        EXPECT_EQ(0, array_to_hexstr(data, sizeof(data), s, sizeof(s)));
+    }
+
+    TEST(FORMAT, hexstr2array_1) {
+        char s[] = "12345678";
+        uint8_t data[20];
+
+        auto length = hexstr_to_array(data, sizeof(data), s, strlen(s));
+
+        ASSERT_THAT(data[0], testing::Eq(0x12));
+        ASSERT_THAT(data[1], testing::Eq(0x34));
+        ASSERT_THAT(data[2], testing::Eq(0x56));
+        ASSERT_THAT(data[3], testing::Eq(0x78));
+    }
+
+    TEST(FORMAT, hexstr2array_2) {
+        char s[] = "FA2345DE";
+        uint8_t data[10];
+
+        auto length = hexstr_to_array(data, sizeof(data), s, strlen(s));
+
+        ASSERT_THAT(data[0], testing::Eq(0xFA));
+        ASSERT_THAT(data[1], testing::Eq(0x23));
+        ASSERT_THAT(data[2], testing::Eq(0x45));
+        ASSERT_THAT(data[3], testing::Eq(0xDE));
+    }
+
+     TEST(FORMAT, hexstr2array_odd_value) {
+        char s[] = "FA2345DEA";
+        uint8_t data[10];
+
+        EXPECT_EQ(0, hexstr_to_array(data, sizeof(data), s, strlen(s)));
+    }
 }