Bdlc packedintarray ubsan drqs 176630428 (#4955)

bloomberg · Sep 16, 2024 · 75a1143 · 75a1143
1 parent 04d8378
commit 75a1143
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/groups/bdl/bdlc/bdlc_flathashmap.h b/groups/bdl/bdlc/bdlc_flathashmap.h
@@ -823,7 +823,7 @@ class FlatHashMap {
     try_emplace(const_iterator, const KEY& key, ARGS&&... args);
 
     /// If a key equivalent to the specified `key` already exists in this
-    /// map, return an iterator referring to the existing item.  Otherwise, 
+    /// map, return an iterator referring to the existing item.  Otherwise,
     /// insert into this map a newly-created `value_type` object,
     /// constructed from `std::forward<KEY>(key)` and the specified `args`,
     /// and return an iterator referring to the newly-created entry.  This

diff --git a/groups/bdl/bdlc/bdlc_packedintarray.h b/groups/bdl/bdlc/bdlc_packedintarray.h
@@ -1664,9 +1664,11 @@ void PackedIntArrayImp<STORAGE>::remove(bsl::size_t dstIndex,
 
     d_length -= numElements;
 
-    bsl::memmove(address() + dstIndex * d_bytesPerElement,
-                 address() + (dstIndex + numElements) * d_bytesPerElement,
-                 (d_length - dstIndex) * d_bytesPerElement);
+    if (address()) {
+        bsl::memmove(address() + dstIndex * d_bytesPerElement,
+                     address() + (dstIndex + numElements) * d_bytesPerElement,
+                     (d_length - dstIndex) * d_bytesPerElement);
+    }
 }
 
 template <class STORAGE>