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

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

Browse Source 
* commit '45ab734a7a30b53e9b76c6fd3286b71f2a35a768':
  Add missing NULL check for android_os_Parcel_writeInt
This commit is contained in:
Brian Carlstrom
2015-06-24 04:45:31 +00:00
committed by Android Git Automerger
parent e42c9ea05f 45ab734a7a
commit ef3b608c81
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_os_Parcel.cpp
View File

@@ -230,9 +230,11 @@ static void android_os_Parcel_writeBlob(JNIEnv* env, jclass clazz, jlong nativeP
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);
}
}
}