1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/SkValidatingReadBuffer.cpp b/src/core/SkValidatingReadBuffer.cpp
index 326d0cf575..1566af9488 100644
--- a/src/core/SkValidatingReadBuffer.cpp
+++ b/src/core/SkValidatingReadBuffer.cpp
@@ -144,6 +144,11 @@ void SkValidatingReadBuffer::readRRect(SkRRect* rrect) {
     const void* ptr = this->skip(sizeof(SkRRect));
     if (!fError) {
         memcpy(rrect, ptr, sizeof(SkRRect));
+        this->validate(rrect->isValid());
+    }
+
+    if (fError) {
+        rrect->setEmpty();
     }
 }