From 10e7e8123dac04d62897f29cdbd17e397cc2e854 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 23 Jun 2015 15:15:18 +0100
Subject: Add missing include, fix bug in handling unknown message fields
---
include/axolotl/cipher.hh | 1 +
src/message.cpp | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/axolotl/cipher.hh b/include/axolotl/cipher.hh
index 93974fd..5a077aa 100644
--- a/include/axolotl/cipher.hh
+++ b/include/axolotl/cipher.hh
@@ -17,6 +17,7 @@
#define AXOLOTL_CIPHER_HH_
#include <cstdint>
+#include <cstddef>
namespace axolotl {
diff --git a/src/message.cpp b/src/message.cpp
index 6ce8ca6..7eea4c2 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -140,10 +140,10 @@ std::uint8_t const * skip_unknown(
) {
if (pos != end) {
uint8_t tag = *pos;
- if (tag & 0x7 == 0) {
+ if ((tag & 0x7) == 0) {
pos = varint_skip(pos, end);
pos = varint_skip(pos, end);
- } else if (tag & 0x7 == 2) {
+ } else if ((tag & 0x7) == 2) {
pos = varint_skip(pos, end);
std::uint8_t const * len_start = pos;
pos = varint_skip(pos, end);
@@ -222,7 +222,7 @@ void axolotl::decode_message(
reader.ciphertext, reader.ciphertext_length
);
if (unknown == pos) {
- pos == skip_unknown(pos, end);
+ pos = skip_unknown(pos, end);
}
unknown = pos;
}
@@ -305,7 +305,7 @@ void axolotl::decode_one_time_key_message(
reader.message, reader.message_length
);
if (unknown == pos) {
- pos == skip_unknown(pos, end);
+ pos = skip_unknown(pos, end);
}
unknown = pos;
}
--
cgit v1.2.3-70-g09d2