fix infinite loop in rosbag buffer resize (#1623)

* fix infinite loop in rosbag buffer resize * grow to max size
ros · Feb 20, 2019 · acd8313 · acd8313
1 parent 4833dc8
commit acd8313
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/tools/rosbag_storage/src/buffer.cpp b/tools/rosbag_storage/src/buffer.cpp
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <utility>
+#include <limits>
 
 #include "rosbag/buffer.h"
 
@@ -65,7 +66,12 @@ void Buffer::ensureCapacity(uint32_t capacity) {
         capacity_ = capacity;
     else {
         while (capacity_ < capacity)
+        {
+          if (static_cast<uint64_t>(capacity) * 2 > std::numeric_limits<uint32_t>::max())
+            capacity_ = std::numeric_limits<uint32_t>::max();
+          else
             capacity_ *= 2;
+        }
     }
 
     buffer_ = (uint8_t*) realloc(buffer_, capacity_);