From 91332e7ecac06ef4cd3320095689e6af21e13dc6 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 16 Oct 2014 16:50:41 -0400 Subject: Report that a JavaInputStreamAdaptor is at end. This prevents a naive caller from continuing to attempt to read. BUG:17419670 BUG:17873145 Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b --- core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'core/jni/android') diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp index b64ab0d..a67740c 100644 --- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp +++ b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp @@ -78,6 +78,8 @@ private: env->ExceptionDescribe(); env->ExceptionClear(); SkDebugf("---- read threw an exception\n"); + // Consider the stream to be at the end, since there was an error. + fIsAtEnd = true; return 0; } @@ -92,6 +94,9 @@ private: env->ExceptionDescribe(); env->ExceptionClear(); SkDebugf("---- read:GetByteArrayRegion threw an exception\n"); + // The error was not with the stream itself, but consider it to be at the + // end, since we do not have a way to recover. + fIsAtEnd = true; return 0; } -- cgit v1.1