From 11dbf2aab3e9a65148a40ac6b5b1124929344c1a Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 26 Apr 2016 18:10:13 +0100
Subject: Fix a bunch of compiler warnings, and turn on warnings.

---
 src/message.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/message.cpp')

diff --git a/src/message.cpp b/src/message.cpp
index 30abd9c..23ec823 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -136,7 +136,7 @@ static std::uint8_t const * decode(
         std::uint8_t const * len_start = pos;
         pos = varint_skip(pos, end);
         std::size_t len = varint_decode<std::size_t>(len_start, pos);
-        if (len > end - pos) return end;
+        if (len + pos > end) return end;
         value = pos;
         value_length = len;
         pos += len;
@@ -157,7 +157,7 @@ static std::uint8_t const * skip_unknown(
             std::uint8_t const * len_start = pos;
             pos = varint_skip(pos, end);
             std::size_t len = varint_decode<std::size_t>(len_start, pos);
-            if (len > end - pos) return end;
+            if (len + pos > end) return end;
             pos += len;
         } else {
             return end;
-- 
cgit v1.2.3