SkPDF: fix name escape code

src/pdf/SkPDFTypes.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
@@ skipping 87 matching lines @@
     return true;
 }
 #endif  // SK_DEBUG
 
 // Given an arbitrary string, convert it to a valid name.
 static SkString escape_name(const char* name, size_t len) {
     static const char kToEscape[] = "#/%()<>[]{}";
     int count = 0;
     const char* const end = &name[len];
     for (const char* n = name; n != end; ++n) {
+        if ('\0' == *n) {

[bungeman-skia, 2015/06/08 15:23:48]

If you're doing it this way, you should drop the 'len' parameter completely and
re-write this to use '\0' as the terminator. If you keep 'len' then '\0' should
be escaped. Since 'name' is coming from sources which claim to be utf-8, it's
theoretically more correct to keep 'len' and escape '\0' properly.

[hal.canary, 2015/06/08 15:55:24]

Done.

+            break;  // http://crbug.com/494913
+        }
         if (*n < '!' || *n > '~' || strchr(kToEscape, *n)) {
             count += 2;
         }
         ++count;
     }
     SkString result(count);
     char* s = result.writable_str();
     static const char kHex[] = "0123456789ABCDEF";
     for (const char* n = name; n != end; ++n) {
+        if ('\0' == *n) {
+            break;
+        }
         if (*n < '!' || *n > '~' || strchr(kToEscape, *n)) {
             *s++ = '#';
             *s++ = kHex[(*n >> 4) & 0xF];
             *s++ = kHex[*n & 0xF];
         } else {
             *s++ = *n;
         }
     }
     SkASSERT(&result.writable_str()[count] == s);  // don't over-write
     return result;                                 // allocated space
@@ skipping 353 matching lines @@
     fObjects.push(obj);
     return true;
 }
 
 int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const {
     int32_t* objectNumberFound = fObjectNumbers.find(obj);
     SkASSERT(objectNumberFound);
     return *objectNumberFound;
 }