summaryrefslogtreecommitdiff
path: root/protocols/WhatsApp/src/wanode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/WhatsApp/src/wanode.cpp')
-rw-r--r--protocols/WhatsApp/src/wanode.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/WhatsApp/src/wanode.cpp b/protocols/WhatsApp/src/wanode.cpp
index f48ceaebd9..0c3fe15d03 100644
--- a/protocols/WhatsApp/src/wanode.cpp
+++ b/protocols/WhatsApp/src/wanode.cpp
@@ -518,17 +518,17 @@ static BYTE packNibble(char c)
static BYTE packHex(char c)
{
- if (c == 0)
- return 15;
-
if (c >= '0' && c <= '9')
return c - '0';
if (c >= 'A' && c <= 'F')
- return c - 'A';
+ return 10 + c - 'A';
if (c >= 'a' && c <= 'f')
- return c - 'a';
+ return 10 + c - 'a';
+
+ if (c == 0)
+ return 15;
return -1;
}
@@ -547,7 +547,7 @@ static bool isNibble(const CMStringA &str)
static bool isHex(const CMStringA &str)
{
- return strspn(str, "0123456789abcdefABCDEF-.") == str.GetLength();
+ return strspn(str, "0123456789abcdefABCDEF") == str.GetLength();
}
void WAWriter::writePacked(const CMStringA &str, int tag)