Merge pull request #1731 from Idclip/ubsan_fix

Idclip · web-flow · commit ccfd27c2a4d3 · 2023-12-19T18:29:09.000+13:00
Fixed an instance of undefined behaviour in tools::activate
diff --git a/openvdb/openvdb/tools/Activate.h b/openvdb/openvdb/tools/Activate.h
@@ -87,6 +87,10 @@ struct ActivateOp
         // only iterate if there are inactive tiles
         if (!node.isValueMaskOn()) {
             for (auto it = node.beginValueOff(); it; ++it) {
+                // Skip child nodes, they'll be processed separately
+                // (InteralNode ValueOff iterators don't automatically
+                // skip these).
+                if (node.isChildMaskOn(it.pos())) continue;
                 if (check(*it))     it.setValueOn(/*on=*/true);
             }
         }
diff --git a/pendingchanges/ubsan.txt b/pendingchanges/ubsan.txt
@@ -0,0 +1,3 @@
+OpenVDB:
+	- Bug Fixes::
+		- Fixed an occurance of undefined behaviour in tools::activate (though this would typically not have manifested with any unintended behaviour)

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,10 @@ struct ActivateOp`
`87`	`87`	`// only iterate if there are inactive tiles`
`88`	`88`	`if (!node.isValueMaskOn()) {`
`89`	`89`	`for (auto it = node.beginValueOff(); it; ++it) {`
	`90`	`+ // Skip child nodes, they'll be processed separately`
	`91`	`+ // (InteralNode ValueOff iterators don't automatically`
	`92`	`+ // skip these).`
	`93`	`+ if (node.isChildMaskOn(it.pos())) continue;`
`90`	`94`	`if (check(it)) it.setValueOn(/on=*/true);`
`91`	`95`	`}`
`92`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+OpenVDB:`
	`2`	`+ - Bug Fixes::`
	`3`	`+ - Fixed an occurance of undefined behaviour in tools::activate (though this would typically not have manifested with any unintended behaviour)`