uninitialized.UndefReturn

diff --git a/src/util/ue2_graph.h b/src/util/ue2_graph.h
index 529105205fb28466c1e7f25cb7e9bd93a98157b0..9d9f22d1fc3713a46b493eb4d8479440f2ca06af 100644 (file)
--- a/src/util/ue2_graph.h
+++ b/src/util/ue2_graph.h
@@ -796,6 +796,9 @@ public:
         explicit prop_map(value_type P_of::*m_in) : member(m_in) { }
 
         reference operator[](key_type k) const {
+            if (k.raw() == nullptr || &(k.raw()->props) == nullptr) {
+                throw std::invalid_argument("Invalid key");
+            }
             return k.raw()->props.*member;
         }
         reference operator()(key_type k) const { return (*this)[k]; }

diff --git a/src/util/unaligned.h b/src/util/unaligned.h
index 3f662de1219594d2565e0f29ea7382ff100c8b8a..e4c7790018dbd0a949986db7c85ac26d98670b8d 100644 (file)
--- a/src/util/unaligned.h
+++ b/src/util/unaligned.h
@@ -58,6 +58,9 @@ u32 unaligned_load_u32(const void *ptr) {
 /// Perform an unaligned 64-bit load
 static really_inline
 u64a unaligned_load_u64a(const void *ptr) {
+    if (ptr == NULL) {
+        return 0;  // Return a default value
+    }
     struct unaligned { u64a u; } PACKED__MAY_ALIAS;
     // cppcheck-suppress cstyleCast
     const struct unaligned *uptr = (const struct unaligned *)ptr;