Skip to content

Commit 1dd5114

Browse files
authored
Merge pull request #351 from maruncz/sanitizer
`ColorFilterArray::shiftDcrawFilter()`: avoid out-of-bounds shifts
2 parents 1a1b723 + 350e090 commit 1dd5114

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/librawspeed/metadata/ColorFilterArray.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ uint32_t ColorFilterArray::shiftDcrawFilter(uint32_t filter, int x, int y) {
153153
// A shift in y direction means rotating the whole int by 4 bits.
154154
y *= 4;
155155
y = y >= 0 ? y % 32 : 32 - ((-y) % 32);
156-
filter = (filter >> y) | (filter << (32 - y));
156+
if (y != 0)
157+
filter = (filter >> y) | (filter << (32 - y));
157158

158159
return filter;
159160
}

0 commit comments

Comments
 (0)