ubsan shift fixes

src/core/SkUtils.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkUtils.h"
@@ skipping 56 matching lines @@
     SkASSERT(utf8);
 
     const uint8_t*  p = (const uint8_t*)utf8;
     int             c = *p;
     int             hic = c << 24;
 
     assert_utf8_leadingbyte(c);
 
     if (hic < 0) {
         uint32_t mask = (uint32_t)~0x3F;
-        hic <<= 1;
+        hic = SkLeftShift(hic, 1);
         do {
             c = (c << 6) | (*++p & 0x3F);
             mask <<= 5;
-        } while ((hic <<= 1) < 0);
+        } while ((hic = SkLeftShift(hic, 1)) < 0);
         c &= ~mask;
     }
     return c;
 }
 
 SkUnichar SkUTF8_NextUnichar(const char** ptr) {
     SkASSERT(ptr && *ptr);
 
     const uint8_t*  p = (const uint8_t*)*ptr;
     int             c = *p;
     int             hic = c << 24;
 
     assert_utf8_leadingbyte(c);
 
     if (hic < 0) {
         uint32_t mask = (uint32_t)~0x3F;
-        hic <<= 1;
+        hic = SkLeftShift(hic, 1);
         do {
             c = (c << 6) | (*++p & 0x3F);
             mask <<= 5;
-        } while ((hic <<= 1) < 0);
+        } while ((hic = SkLeftShift(hic, 1)) < 0);
         c &= ~mask;
     }
     *ptr = (char*)p + 1;
     return c;
 }
 
 SkUnichar SkUTF8_PrevUnichar(const char** ptr) {
     SkASSERT(ptr && *ptr);
 
     const char* p = *ptr;
@@ skipping 158 matching lines @@
         }
     } else {
         char* start = utf8;
         while (utf16 < stop) {
             utf8 += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), utf8);
         }
         size = utf8 - start;
     }
     return size;
 }