From e54c4455389e93ad3eff2ebe7b140dd48175e4b6 Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Mon, 8 Aug 2016 13:55:16 -0400 Subject: [PATCH] 8161431: JNI pending exceptions in ProcessHandleImpl_linux.c and ProcessHandleImpl_unix.c Reviewed-by: naoto --- .../java.base/linux/native/libjava/ProcessHandleImpl_linux.c | 1 + .../java.base/unix/native/libjava/ProcessHandleImpl_unix.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c b/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c index cae982e7904..7792569aba2 100644 --- a/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c +++ b/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c @@ -146,6 +146,7 @@ void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) { snprintf(fn, sizeof fn, "/proc/%d", pid); if (stat(fn, &stat_buf) == 0) { unix_getUserInfo(env, jinfo, stat_buf.st_uid); + JNU_CHECK_EXCEPTION(env); } /* diff --git a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c index afbe1e275ee..f2b714f5023 100644 --- a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c +++ b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c @@ -429,7 +429,9 @@ void unix_fillArgArray(JNIEnv *env, jobject jinfo, int nargs, char *cp, if (nargs >= 1) { // Create a String array for nargs-1 elements - argsArray = (*env)->NewObjectArray(env, nargs - 1, JNU_ClassString(env), NULL); + jclass clazzString = JNU_ClassString(env); + CHECK_NULL(clazzString); + argsArray = (*env)->NewObjectArray(env, nargs - 1, clazzString, NULL); CHECK_NULL(argsArray); for (i = 0; i < nargs - 1; i++) {