whitelist fallback typefaces

src/core/SkString.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 "SkAtomics.h"
@@ skipping 359 matching lines @@
         fRec->fLength = SkToU32(len);
     } else if (1 == fRec->fRefCnt && (fRec->fLength >> 2) == (len >> 2)) {
         // we have spare room in the current allocation, so don't alloc a larger one
         char* p = this->writable_str();
         if (text) {
             memcpy(p, text, len);
         }
         p[len] = 0;
         fRec->fLength = SkToU32(len);
     } else {
-        SkString tmp(text, len);
+        SkString tmp(text ? text : this->c_str(), len);

[bungeman-skia, 2015/08/28 21:09:57]

What is this for? If text is NULL here, shouldn't the len always be 0 or this
should fault?

[reed1, 2015/08/31 12:20:25]

+1 -- seems like its an error (assert?) to pass NULL w/ non-zero length

         this->swap(tmp);
     }
 }
 
 void SkString::setUTF16(const uint16_t src[]) {
     int count = 0;
 
     while (src[count]) {
         count += 1;
     }
@@ skipping 240 matching lines @@
         const size_t len = strcspn(str, delimiters);
         out->push_back().set(str, len);
         str += len;
         // Skip any delimiters.
         str += strspn(str, delimiters);
     }
 }
 
 #undef VSNPRINTF
 #undef SNPRINTF