Provide safe copy assertion in RawStatData::initialize()

ambuc · ambuc · commit 2aa9d8c19707 · 2018-07-11T10:13:00.000-04:00
Signed-off-by: James Buckland &lt;jbuckland@google.com&gt;
diff --git a/source/common/stats/stats_impl.cc b/source/common/stats/stats_impl.cc
@@ -136,8 +136,9 @@ bool TagExtractorImpl::extractTag(const std::string& stat_name, std::vector<Tag>
 }
 
 RawStatData* HeapRawStatDataAllocator::alloc(const std::string& name) {
-  RawStatData* data = static_cast<RawStatData*>(::calloc(RawStatData::sizeGivenName(name), 1));
-  data->initialize(name);
+  uint64_t num_bytes_to_allocate = RawStatData::sizeGivenName(name);
+  RawStatData* data = static_cast<RawStatData*>(::calloc(num_bytes_to_allocate, 1));
+  data->initialize(name, num_bytes_to_allocate);
 
   Thread::ReleasableLockGuard lock(mutex_);
   auto ret = stats_.insert(data);
@@ -331,11 +332,13 @@ void HeapRawStatDataAllocator::free(RawStatData& data) {
   ::free(&data);
 }
 
-void RawStatData::initialize(absl::string_view key) {
+void RawStatData::initialize(absl::string_view key, uint64_t num_bytes_allocated) {
   ASSERT(!initialized());
   ref_count_ = 1;
 
   uint64_t xfer_size = key.size();
+  ASSERT(xfer_size <= num_bytes_allocated);
+
   memcpy(name_, key.data(), xfer_size);
   name_[xfer_size] = '\0';
 }
diff --git a/source/common/stats/stats_impl.h b/source/common/stats/stats_impl.h
@@ -219,9 +219,10 @@ struct RawStatData {
   /**
    * Initializes this object to have the specified key,
    * a refcount of 1, and all other values zero. Required for the HeapRawStatDataAllocator, which
-   * does not expect stat name truncation.
+   * does not expect stat name truncation. We pass in the number of bytes allocated in order to
+   * assert the copy is safe inline.
    */
-  void initialize(absl::string_view key);
+  void initialize(absl::string_view key, uint64_t num_bytes_allocated);
 
   /**
    * Initializes this object to have the specified key,
