Fix a UBSan warning in ObfuscatedFileUtilMemoryDelegate

Due to a C language bug, memcpy is UB with NULL, 0. The C++ types avoid this bug and are slightly more bounds-aware. Bug: 1394755 Change-Id: Id9a152727914bff099d95f350040f02927c58961 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4986624 Auto-Submit: David Benjamin <[email protected]> Commit-Queue: Austin Sullivan <[email protected]> Reviewed-by: Austin Sullivan <[email protected]> Cr-Commit-Position: refs/heads/main@{#1217115}
MyoungJinNam · Oct 30, 2023 · 21fcd5a · 21fcd5a
1 parent 99be2eb
commit 21fcd5a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/storage/browser/file_system/obfuscated_file_util_memory_delegate.cc b/storage/browser/file_system/obfuscated_file_util_memory_delegate.cc
@@ -12,6 +12,7 @@
 #include "base/memory/raw_ptr_exclusion.h"
 #include "base/numerics/checked_math.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/ranges/algorithm.h"
 #include "base/system/sys_info.h"
 #include "build/build_config.h"
 #include "net/base/io_buffer.h"
@@ -518,7 +519,9 @@ int ObfuscatedFileUtilMemoryDelegate::ReadFile(const base::FilePath& path,
   if (buf_len > remaining)
     buf_len = static_cast<int>(remaining);
 
-  memcpy(buf->data(), dp->entry->file_content.data() + offset, buf_len);
+  base::ranges::copy(
+      base::span(dp->entry->file_content).subspan(offset, buf_len),
+      buf->data());
 
   return buf_len;
 }