Merge pull request #954 from kovdan01/fix_ub_in_v4raw

redboltz · web-flow · commit fc3de9806ea3 · 2021-05-10T21:45:57.000+09:00
Fix UB in v4raw_ref::operator==
diff --git a/include/msgpack/v1/adaptor/v4raw.hpp b/include/msgpack/v1/adaptor/v4raw.hpp
@@ -33,7 +33,7 @@ struct v4raw_ref {
 
     bool operator== (const v4raw_ref& x) const
     {
-        return size == x.size && std::memcmp(ptr, x.ptr, size) == 0;
+        return size == x.size && (size == 0 || std::memcmp(ptr, x.ptr, size) == 0);
     }
 
     bool operator!= (const v4raw_ref& x) const

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ struct v4raw_ref {`
`33`	`33`
`34`	`34`	`bool operator== (const v4raw_ref& x) const`
`35`	`35`	`{`
`36`		`- return size == x.size && std::memcmp(ptr, x.ptr, size) == 0;`
	`36`	`+ return size == x.size && (size == 0 \|\| std::memcmp(ptr, x.ptr, size) == 0);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`bool operator!= (const v4raw_ref& x) const`