Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev

Browse Source 
* commit '80a058b3033200835f86ee0e61367a87a470cde8':
  Do not attempt to decode  NULL SkData.
This commit is contained in:
Leon Scroggins III
2013-10-08 06:35:04 -07:00
committed by Android Git Automerger
parent d386c0a4f3 80a058b303
commit 97b707d5eb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -514,6 +514,9 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi
} }
SkAutoTUnref<SkData> data(SkData::NewFromFD(descriptor)); SkAutoTUnref<SkData> data(SkData::NewFromFD(descriptor));
if (data.get() == NULL) {
return nullObjectReturn("NewFromFD failed in nativeDecodeFileDescriptor");
}
SkAutoTUnref<SkMemoryStream> stream(new SkMemoryStream(data)); SkAutoTUnref<SkMemoryStream> stream(new SkMemoryStream(data));
/* Allow purgeable iff we own the FD, i.e., in the puregeable and /* Allow purgeable iff we own the FD, i.e., in the puregeable and