commit 25bc7b1679083b08b7aabe43df5b45776ac7d5d8
author Pete Bentley <prb@google.com> Mon Aug 20 15:40:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 20 15:40:59 2018 +0000
tree 93f8d403c8cfae4a98a3eda422f1d8e1e48a40f3
parent 5b3fc078949565f9fb665010716d5b7854347dda
parent 0505b227028992f6f3fa77aa671d595c6fa13d6f

Merge "Handle null FileDescriptors passed to native methods."

JNIHelp.cpp

diff --git a/JNIHelp.cpp b/JNIHelp.cpp
index 22f95b6..88e968b 100644
--- a/JNIHelp.cpp
+++ b/JNIHelp.cpp
@@ -410,7 +410,12 @@
     if (fileDescriptorDescriptorField == nullptr) {
         InitFieldsAndMethods(e);
     }
-    (*env)->SetIntField(e, fileDescriptor, fileDescriptorDescriptorField, value);
+
+    if (fileDescriptor == nullptr) {
+        jniThrowNullPointerException(e, "null FileDescriptor");
+    } else {
+        e->SetIntField(fileDescriptor, fileDescriptorDescriptorField, value);
+    }
 }
 
 jlong jniGetOwnerIdFromFileDescriptor(C_JNIEnv* env, jobject fileDescriptor) {

include/nativehelper/JNIHelp.h

diff --git a/include/nativehelper/JNIHelp.h b/include/nativehelper/JNIHelp.h
index 16747a9..c3c0ecc 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/include/nativehelper/JNIHelp.h
@@ -94,7 +94,8 @@
 int jniGetFDFromFileDescriptor(C_JNIEnv* env, jobject fileDescriptor);
 
 /*
- * Sets the int fd in a java.io.FileDescriptor.
+ * Sets the int fd in a java.io.FileDescriptor.  Throws java.lang.NullPointerException
+ * if fileDescriptor is null.
  */
 void jniSetFileDescriptorOfFD(C_JNIEnv* env, jobject fileDescriptor, int value);