diff --git a/snappy.cc b/snappy.cc
index fad78e9..e35eb7c 100644
--- a/snappy.cc
+++ b/snappy.cc
@@ -709,6 +709,20 @@ static inline uint32 ExtractLowBytes(uint32 v, int n) {
 #endif
 }
 
+static inline bool LeftShiftOverflows(uint32 value, uint32 shift) {
+  DCHECK_LT(shift, 32);
+  static const uint32 masks[] = {
+      0x00000000, 0x80000000, 0xc0000000, 0xe0000000,  //
+      0xf0000000, 0xf8000000, 0xfc000000, 0xfe000000,  //
+      0xff000000, 0xff800000, 0xffc00000, 0xffe00000,  //
+      0xfff00000, 0xfff80000, 0xfffc0000, 0xfffe0000,  //
+      0xffff0000, 0xffff8000, 0xffffc000, 0xffffe000,  //
+      0xfffff000, 0xfffff800, 0xfffffc00, 0xfffffe00,  //
+      0xffffff00, 0xffffff80, 0xffffffc0, 0xffffffe0,  //
+      0xfffffff0, 0xfffffff8, 0xfffffffc, 0xfffffffe};
+  return (value & masks[shift]) != 0;
+}
+
 // Helper class for decompression
 class SnappyDecompressor {
  private:
@@ -761,7 +775,7 @@ class SnappyDecompressor {
       const unsigned char c = *(reinterpret_cast<const unsigned char*>(ip));
       reader_->Skip(1);
       uint32 val = c & 0x7f;
-      if (((val << shift) >> shift) != val) return false;
+      if (LeftShiftOverflows(val, shift)) return false;
       *result |= val << shift;
       if (c < 128) {
         break;