diff options
| author | Raph Levien <raph@google.com> | 2014-06-02 13:37:34 -0700 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-06-02 13:37:34 -0700 |
| commit | a0cba0fde3e39723052a50e1f09e3b254da6c175 (patch) | |
| tree | 823207d2cd0c796ec6bb8cfd058ee08582430045 /core/jni/android | |
| parent | a9efb284088cf52a3819cdf88ff6cc4109e517ca (diff) | |
| download | frameworks_base-a0cba0fde3e39723052a50e1f09e3b254da6c175.zip frameworks_base-a0cba0fde3e39723052a50e1f09e3b254da6c175.tar.gz frameworks_base-a0cba0fde3e39723052a50e1f09e3b254da6c175.tar.bz2 | |
Check for NULL on TypefaceImpl unref
It's possible for a TypefaceImpl to contain a null pointer, which was
causing crashes on unref. This patch just checks for NULL.
Fixes bug 15104801 "Aviate Launcher crashes on startup - Hammerhead L
AAV49B"
Change-Id: Idf9f176c54bf81ff3daacc0b33e95aa9d8bbe57f
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/TypefaceImpl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android/graphics/TypefaceImpl.cpp b/core/jni/android/graphics/TypefaceImpl.cpp index 958cd85..ff52b07 100644 --- a/core/jni/android/graphics/TypefaceImpl.cpp +++ b/core/jni/android/graphics/TypefaceImpl.cpp @@ -171,7 +171,9 @@ TypefaceImpl* TypefaceImpl_createFromFamilies(const jlong* families, size_t size } void TypefaceImpl_unref(TypefaceImpl* face) { - face->fFontCollection->Unref(); + if (face != NULL) { + face->fFontCollection->Unref(); + } delete face; } |