Merge pull request #148 from AtomCrafty/dev

Return null when patching call that was replaced with nop slide
powerof3 · Nov 11, 2024 · 35f1e3b · 35f1e3b
2 parents 99cc220 + 2056f59
commit 35f1e3b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/include/SKSE/Trampoline.h b/include/SKSE/Trampoline.h
@@ -138,9 +138,10 @@ namespace SKSE
 		template <std::size_t N>
 		[[nodiscard]] std::uintptr_t write_branch(std::uintptr_t a_src, std::uintptr_t a_dst, std::uint8_t a_data)
 		{
+			const auto isNop = *reinterpret_cast<std::int8_t*>(a_src) == 0x90;
 			const auto disp = reinterpret_cast<std::int32_t*>(a_src + N - 4);
 			const auto nextOp = a_src + N;
-			const auto func = nextOp + *disp;
+			const auto func = isNop ? 0 : nextOp + *disp;
 
 			if constexpr (N == 5) {
 				write_5branch(a_src, a_dst, a_data);