Make left or right shift by negative number return 0, instead of trig…

…gering undefined behavior (fixes #515)
duckdb · Apr 11, 2020 · 7e1234d · 7e1234d
1 parent 0d29535
commit 7e1234d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/function/scalar/operators/bitwise.cpp b/src/function/scalar/operators/bitwise.cpp
@@ -65,7 +65,7 @@ void BitwiseXorFun::RegisterFunction(BuiltinFunctions &set) {
 //===--------------------------------------------------------------------===//
 struct BitwiseShiftLeftOperator {
 	template <class TA, class TB, class TR> static inline TR Operation(TA left, TB right) {
-		return left << right;
+		return right < 0 ? 0 : left << right;
 	}
 };
 
@@ -83,7 +83,7 @@ void LeftShiftFun::RegisterFunction(BuiltinFunctions &set) {
 //===--------------------------------------------------------------------===//
 struct BitwiseShiftRightOperator {
 	template <class TA, class TB, class TR> static inline TR Operation(TA left, TB right) {
-		return left >> right;
+		return right < 0 ? 0 : left >> right;
 	}
 };