src/images/SkImageDecoder_libico.cpp - Issue 1503423003: ubsan shift fixes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/images/SkImageDecoder_libico.cpp

Issue 1503423003: ubsan shift fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/images/SkImageDecoder_libico.cpp

diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp

index e8b4bc5c316cbe1b7fd587b85e5abdd672bb4f8f..78ac660224c0d8498d89e9b38a211bba7d48ddd4 100644

--- a/src/images/SkImageDecoder_libico.cpp

+++ b/src/images/SkImageDecoder_libico.cpp

@@ -32,8 +32,8 @@ private:

//read in Intel order, and return an integer

#define readByte(buffer,begin) buffer[begin]

-#define read2Bytes(buffer,begin) buffer[begin]+(buffer[begin+1]<<8)

-#define read4Bytes(buffer,begin) buffer[begin]+(buffer[begin+1]<<8)+(buffer[begin+2]<<16)+(buffer[begin+3]<<24)

+#define read2Bytes(buffer,begin) buffer[begin]+buffer[begin+1]*(1<<8)

+#define read4Bytes(buffer,begin) buffer[begin]+buffer[begin+1]*(1<<8)+buffer[begin+2]*(1<<16)+buffer[begin+3]*(1<<24)

/////////////////////////////////////////////////////////////////////////////////////////