Fix to previous commit

cvet · Jan 16, 2025 · 60d2a95 · 60d2a95
1 parent df4ea76
commit 60d2a95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/Common/Common.h b/Source/Common/Common.h
@@ -1370,7 +1370,7 @@ class DataReader
             throw DataReadingException("Unexpected end of buffer");
         }
 
-        T data = *reinterpret_cast<const T*>(&_dataBuf[_readPos]);
+        T data = *reinterpret_cast<const T*>(_dataBuf.data() + _readPos);
         _readPos += sizeof(T);
         return data;
     }
@@ -1383,7 +1383,7 @@ class DataReader
         }
 
         if (size != 0) {
-            const T* ptr = reinterpret_cast<const T*>(&_dataBuf[_readPos]);
+            const T* ptr = reinterpret_cast<const T*>(_dataBuf.data() + _readPos);
             _readPos += size;
             return ptr;
         }
@@ -1398,7 +1398,7 @@ class DataReader
             throw DataReadingException("Unexpected end of buffer");
         }
 
-        MemCopy(ptr, &_dataBuf[_readPos], sizeof(T));
+        MemCopy(ptr, _dataBuf.data() + _readPos, sizeof(T));
         _readPos += sizeof(T);
     }
 

diff --git a/Source/Common/StringUtils.cpp b/Source/Common/StringUtils.cpp
@@ -142,7 +142,7 @@ auto strex::startsWith(string_view r) const noexcept -> bool
 {
     NO_STACK_TRACE_ENTRY();
 
-    return _sv.length() >= r.length() && MemCompare(_sv.data(), r.data(), r.length()) == 0;
+    return _sv.length() >= r.length() && _sv.compare(0, r.length(), r) == 0;
 }
 
 auto strex::endsWith(char r) const noexcept -> bool