Safely convert from uint64_t to size_t.

This fixes #8. Signed-off-by: Todd Malsbary <[email protected]>
ros2 · May 15, 2019 · 4eb1bb9 · 4eb1bb9
1 parent 2ee61af
commit 4eb1bb9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/rmw_dps_cpp/include/rmw_dps_cpp/CborStream.hpp b/rmw_dps_cpp/include/rmw_dps_cpp/CborStream.hpp
@@ -480,10 +480,15 @@ class RxStream
   inline RxStream & deserializeSequenceSize(size_t * size)
   {
     uint8_t maj;
-    DPS_Status ret = CBOR_Peek(&buffer_, &maj, size);
+    uint64_t info;
+    DPS_Status ret = CBOR_Peek(&buffer_, &maj, &info);
     if (ret != DPS_OK || (maj != CBOR_ARRAY && maj != CBOR_BYTES)) {
       throw std::runtime_error("failed to deserialize array size");
     }
+    if (info > std::numeric_limits<std::size_t>::max()) {
+      throw std::runtime_error("array size too large");
+    }
+    *size = info;
     return *this;
   }