fix: correct handling of the zero case

romainthomas · romainthomas · commit d336834b1152 · 2026-03-20T18:17:48.000+01:00
diff --git a/src/PE/layout_check.cpp b/src/PE/layout_check.cpp
@@ -137,14 +137,14 @@ class LayoutChecker {
   }
 
   bool contains(uint64_t va) const {
+    if (va == 0) {
+      return true;
+    }
     return vaddr_start <= va && va < vaddr_end;
   }
 
   bool contains(optional<uint64_t> va) const {
-    if (va.value_or(0) == 0) {
-      return true;
-    }
-    return contains(*va);
+    return contains(va.value_or(0));
   }
 
   private:

Original file line number	Diff line number	Diff line change
`@@ -137,14 +137,14 @@ class LayoutChecker {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`bool contains(uint64_t va) const {`
	`140`	`+ if (va == 0) {`
	`141`	`+ return true;`
	`142`	`+ }`
`140`	`143`	`return vaddr_start <= va && va < vaddr_end;`
`141`	`144`	`}`
`142`	`145`
`143`	`146`	`bool contains(optional<uint64_t> va) const {`
`144`		`- if (va.value_or(0) == 0) {`
`145`		`- return true;`
`146`		`- }`
`147`		`- return contains(*va);`
	`147`	`+ return contains(va.value_or(0));`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`private:`