components/library/icu/patches/093-source-common-unisetspan.cpp.patch

   1 #
   2 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   3 #
   4 Add NULL checks to getBuffer calls
   5 https://unicode-org.atlassian.net/browse/ICU-12378
   6
   7 --- icu/source/common/unisetspan.cpp.orig
   8 +++ icu/source/common/unisetspan.cpp
   9 @@ -660,6 +660,8 @@
  10                  }
  11                  const UnicodeString& string = *static_cast<const UnicodeString*>(strings.elementAt(i));
  12                  const char16_t *s16=string.getBuffer();
  13 +                if (s16 == nullptr)
  14 +                    continue;
  15                  int32_t length16=string.length();
  16                  U_ASSERT(length>0);
  17
  18 @@ -1373,6 +1375,8 @@
  19              }
  20              const UnicodeString& string = *static_cast<const UnicodeString*>(strings.elementAt(i));
  21              const char16_t *s16=string.getBuffer();
  22 +            if (s16 == nullptr)
  23 +                continue;
  24              int32_t length16=string.length();
  25              U_ASSERT(length>0);
  26              if(length16<=rest && matches16CPB(s, pos, length, s16, length16)) {
  27 @@ -1417,6 +1421,8 @@
  28              }
  29              const UnicodeString& string = *static_cast<const UnicodeString*>(strings.elementAt(i));
  30              const char16_t *s16=string.getBuffer();
  31 +            if (s16 == nullptr)
  32 +                continue;
  33              int32_t length16=string.length();
  34              U_ASSERT(length>0);
  35              if(length16<=pos && matches16CPB(s, pos-length16, length, s16, length16)) {