aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-07 18:58:42 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-07 18:58:42 +0100
commita4b2927884ded37556ea5009e10fffe12d8a6706 (patch)
treefb1fede1c6cd2cb04cba27c92716901145080ced
parent76ecd85c2cf4b9b1fb2350774d24860537d1d571 (diff)
Initialise the length fields of the reader struct in decode_message, even if the message is invalid, fixes a crash where the message was too short
-rw-r--r--src/message.cpp16
-rw-r--r--tests/test_olm_decrypt.cpp3
2 files changed, 14 insertions, 5 deletions
diff --git a/src/message.cpp b/src/message.cpp
index 8e807fd..ffb9f6c 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -204,13 +204,16 @@ void olm::decode_message(
std::uint8_t const * end = input + input_length - mac_length;
std::uint8_t const * unknown = nullptr;
- if (pos == end) return;
- reader.version = *(pos++);
reader.input = input;
reader.input_length = input_length;
reader.has_counter = false;
reader.ratchet_key = nullptr;
+ reader.ratchet_key_length = 0;
reader.ciphertext = nullptr;
+ reader.ciphertext_length = 0;
+
+ if (pos == end) return;
+ reader.version = *(pos++);
while (pos != end) {
pos = decode(
@@ -284,12 +287,17 @@ void olm::decode_one_time_key_message(
std::uint8_t const * end = input + input_length;
std::uint8_t const * unknown = nullptr;
- if (pos == end) return;
- reader.version = *(pos++);
reader.one_time_key = nullptr;
+ reader.one_time_key_length = 0;
reader.identity_key = nullptr;
+ reader.identity_key_length = 0;
reader.base_key = nullptr;
+ reader.base_key_length = 0;
reader.message = nullptr;
+ reader.message_length = 0;
+
+ if (pos == end) return;
+ reader.version = *(pos++);
while (pos != end) {
pos = decode(
diff --git a/tests/test_olm_decrypt.cpp b/tests/test_olm_decrypt.cpp
index f089665..3f2a994 100644
--- a/tests/test_olm_decrypt.cpp
+++ b/tests/test_olm_decrypt.cpp
@@ -3,7 +3,8 @@
const char * test_cases[] = {
"41776f",
- "7fff6f0101346d671201"
+ "7fff6f0101346d671201",
+ "ee776f41496f674177804177778041776f6716670a677d6f670a67c2677d",
};