Initial error handling code

src/core/SkOrderedReadBuffer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
@@ skipping 281 matching lines @@
             return NULL; // writer failed to give us the flattenable
         }
     }
 
     // if we get here, factory may still be null, but if that is the case, the
     // failure was ours, not the writer.
     SkFlattenable* obj = NULL;
     uint32_t sizeRecorded = fReader.readU32();
     if (factory) {
         uint32_t offset = fReader.offset();
+        fError = false; // Reset error state before calling factory function
         obj = (*factory)(*this);
+        if (fError) {

[scroggo, 2013/08/21 23:56:00]

From here, do we assume the rest of this stream is still good and continue
reading?

[sugoi1, 2013/08/22 14:26:23]

For now, since we don't what kind of error we hit, it may be a bit harsh to
assume that any error means that the entire stream is invalid. I was also unsure
about the side effects of not reading the entire size we were supposed to read
(it may be safe to quit right away, but I haven't tested it).

+            delete obj;
+            obj = NULL;
+        }
         // check that we read the amount we expected
         uint32_t sizeRead = fReader.offset() - offset;
         if (sizeRecorded != sizeRead) {
             // we could try to fix up the offset...
             sk_throw();
         }
     } else {
         // we must skip the remaining data
         fReader.skip(sizeRecorded);
     }
     return obj;
 }