Bug 1316231 - DTLS 1.3 ACKs. r=mt

1 files changed, 14 insertions, 2 deletions

diff --git a/cpputil/databuffer.h b/cpputil/databuffer.h
index 287cbb2a7..d229a360a 100644
--- a/cpputil/databuffer.h
+++ b/cpputil/databuffer.h
@@ -100,8 +100,8 @@ class DataBuffer {
 
   // This can't use the same trick as Write(), since we might be reading from a
   // smaller data source.
-  bool Read(size_t index, size_t count, uint32_t* val) const {
-    assert(count < sizeof(uint32_t));
+  bool Read(size_t index, size_t count, uint64_t* val) const {
+    assert(count <= sizeof(uint64_t));
     assert(val);
     if ((index > len()) || (count > (len() - index))) {
       return false;
@@ -113,6 +113,18 @@ class DataBuffer {
     return true;
   }
 
+  // Overload because we have a lot of places where we are doing uint32_t
+  bool Read(size_t index, size_t count, uint32_t* val) const {
+    assert(count <= sizeof(uint32_t));
+    uint64_t tmp;
+
+    if (!Read(index, count, &tmp)) {
+      return false;
+    }
+    *val = tmp & 0xffffffff;
+    return true;
+  }
+
   // Starting at |index|, remove |remove| bytes and replace them with the
   // contents of |buf|.
   void Splice(const DataBuffer& buf, size_t index, size_t remove = 0) {