Fix undefined behavior in syntax_option_type::operator~ and match_flag_type::operator./a.out Found by UBSan

Marshall Clow · Marshall Clow · commit 1c2c986796f1 · 2013-03-22T02:13:55.000Z
llvm-svn: 177693
diff --git a/libcxx/include/regex b/libcxx/include/regex
@@ -764,7 +764,7 @@ _LIBCPP_CONSTEXPR
 syntax_option_type
 operator~(syntax_option_type __x)
 {
-    return syntax_option_type(~int(__x));
+    return syntax_option_type(~int(__x) & 0x1FF);
 }
 
 inline _LIBCPP_INLINE_VISIBILITY
@@ -840,7 +840,7 @@ _LIBCPP_CONSTEXPR
 match_flag_type
 operator~(match_flag_type __x)
 {
-    return match_flag_type(~int(__x));
+    return match_flag_type(~int(__x) & 0x0FFF);
 }
 
 inline _LIBCPP_INLINE_VISIBILITY

Original file line number	Diff line number	Diff line change
`@@ -764,7 +764,7 @@ _LIBCPP_CONSTEXPR`
`764`	`764`	`syntax_option_type`
`765`	`765`	`operator~(syntax_option_type __x)`
`766`	`766`	`{`
`767`		`- return syntax_option_type(~int(__x));`
	`767`	`+ return syntax_option_type(~int(__x) & 0x1FF);`
`768`	`768`	`}`
`769`	`769`
`770`	`770`	`inline _LIBCPP_INLINE_VISIBILITY`
`@@ -840,7 +840,7 @@ _LIBCPP_CONSTEXPR`
`840`	`840`	`match_flag_type`
`841`	`841`	`operator~(match_flag_type __x)`
`842`	`842`	`{`
`843`		`- return match_flag_type(~int(__x));`
	`843`	`+ return match_flag_type(~int(__x) & 0x0FFF);`
`844`	`844`	`}`
`845`	`845`
`846`	`846`	`inline _LIBCPP_INLINE_VISIBILITY`