Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: src/core/SkOrderedReadBuffer.cpp

Issue 23021015: Initial error handling code (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: 2nd proposition, with some comments adressed Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/core/SkOrderedReadBuffer.cpp
diff --git a/src/core/SkOrderedReadBuffer.cpp b/src/core/SkOrderedReadBuffer.cpp
index 9d991949084e5b9586d57baeaadf72363eb3e3ef..d535fefc446fa87688eaae1002e8d85cb479babd 100644
--- a/src/core/SkOrderedReadBuffer.cpp
+++ b/src/core/SkOrderedReadBuffer.cpp
@@ -299,7 +299,12 @@ SkFlattenable* SkOrderedReadBuffer::readFlattenable() {
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
sugoi1 2013/08/22 14:26:23 For now, since we don't what kind of error we hit,
+ delete obj;
+ obj = NULL;
+ }
// check that we read the amount we expected
uint32_t sizeRead = fReader.offset() - offset;
if (sizeRecorded != sizeRead) {

Powered by Google App Engine
This is Rietveld 408576698