commit 5e88033f31810350bdba2fbd779738f6a43328e9
author mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 15 21:01:32 2013 +0000
committer mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 15 21:01:32 2013 +0000
tree 91426205f807bdc13f227e4aec8d52f209779a68
parent 58c83eaf13be5d612163b614ca76ace76322bf1d

Write NULL as "" so readString() always returns a non-NULL string.

BUG=
R=reed@google.com

Review URL: https://codereview.chromium.org/22862002

git-svn-id: http://skia.googlecode.com/svn/trunk/src@10754 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkWriter32.cpp

diff --git a/core/SkWriter32.cpp b/core/SkWriter32.cpp
index e41e2df..ca21c5a 100644
--- a/core/SkWriter32.cpp
+++ b/core/SkWriter32.cpp
@@ -246,12 +246,6 @@
 
 const char* SkReader32::readString(size_t* outLen) {
     size_t len = this->readInt();
-    if (0xFFFF == len) {
-        if (outLen) {
-            *outLen = 0;
-        }
-        return NULL;
-    }
     const void* ptr = this->peek();
 
     // skip over teh string + '\0' and then pad to a multiple of 4
@@ -275,9 +269,8 @@
 
 void SkWriter32::writeString(const char str[], size_t len) {
     if (NULL == str) {
-        // We're already requiring len < 0xFFFF, so we can use that to mark NULL.
-        this->write32(0xFFFF);
-        return;
+        str = "";
+        len = 0;
     }
     if ((long)len < 0) {
         len = strlen(str);