Fix some sanitizer errors

lhmouse · Feb 15, 2024 · 1c9b5ac · 1c9b5ac
1 parent fa66993
commit 1c9b5ac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/asteria/library/string.cpp b/asteria/library/string.cpp
@@ -1402,8 +1402,10 @@ std_string_url_encode(V_string data)
         continue;
 
       // Escape it.
-      pseq[1] = s_base16_table[(c >> 3) & 0x1E];
-      pseq[2] = s_base16_table[(c << 1) & 0x1E];
+      uint32_t hi = static_cast<uint32_t>((c & 0xF0) >> 3);
+      uint32_t lo = static_cast<uint32_t>((c & 0x0F) << 1);
+      pseq[1] = s_base16_table[hi];
+      pseq[2] = s_base16_table[lo];
       text.replace(nread - 1, 1, pseq, 3);
       nread += 2;
     }
@@ -1478,8 +1480,10 @@ std_string_url_query_encode(V_string data)
       }
 
       // Escape it.
-      pseq[1] = s_base16_table[(c >> 3) & 0x1E];
-      pseq[2] = s_base16_table[(c << 1) & 0x1E];
+      uint32_t hi = static_cast<uint32_t>((c & 0xF0) >> 3);
+      uint32_t lo = static_cast<uint32_t>((c & 0x0F) << 1);
+      pseq[1] = s_base16_table[hi];
+      pseq[2] = s_base16_table[lo];
       text.replace(nread - 1, 1, pseq, 3);
       nread += 2;
     }

diff --git a/asteria/llds/avm_rod.cpp b/asteria/llds/avm_rod.cpp
@@ -75,7 +75,8 @@ clear() noexcept
     }
 
 #ifdef ROCKET_DEBUG
-    ::memset(this->m_bptr, 0xE6, this->m_estor * sizeof(Header));
+    if(this->m_bptr)
+      ::memset(this->m_bptr, 0xE6, this->m_estor * sizeof(Header));
 #endif
     this->m_einit = 0;
   }

diff --git a/asteria/runtime/air_node.cpp b/asteria/runtime/air_node.cpp
@@ -705,7 +705,7 @@ do_apply_binary_operator_with_integer(uint8_t uxop, Value& lhs, V_integer irhs)
                        "Arithmetic left shift overflow (operands were `$1` and `$2`)",
                        lhs, irhs);
 
-            val <<= count;
+            reinterpret_cast<uint64_t&>(val) <<= count;
             return air_status_next;
           }