commit ef3b608c81a67423e94a6f3a17f33e7354ad0d9f
author Brian Carlstrom <bdc@google.com> Wed Jun 24 04:45:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 04:45:31 2015 +0000
tree efa3a79a54523e9ba66e85b2764757bc15baaae2
parent e42c9ea05f3bc7de221147a1beff49ddeca91a3a
parent 45ab734a7a30b53e9b76c6fd3286b71f2a35a768

am 45ab734a: Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev

* commit '45ab734a7a30b53e9b76c6fd3286b71f2a35a768':
  Add missing NULL check for android_os_Parcel_writeInt

core/jni/android_os_Parcel.cpp

diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp
index 2ee9283..0f5ba83f 100644
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -230,9 +230,11 @@
 
 static void android_os_Parcel_writeInt(JNIEnv* env, jclass clazz, jlong nativePtr, jint val) {
     Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);
-    const status_t err = parcel->writeInt32(val);
-    if (err != NO_ERROR) {
-        signalExceptionForError(env, clazz, err);
+    if (parcel != NULL) {
+        const status_t err = parcel->writeInt32(val);
+        if (err != NO_ERROR) {
+            signalExceptionForError(env, clazz, err);
+        }
     }
 }