From 226c05965833a71c8dbb11c7e07e789d675485bb Mon Sep 17 00:00:00 2001 From: Mark Sheppard Date: Thu, 20 Mar 2014 16:19:08 +0000 Subject: [PATCH] 8036134: Check src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c for JNI pending exceptions Check malloc return value and added JUN_ThrowOutOfMemoryException Reviewed-by: alanb --- .../native/sun/nio/fs/WindowsNativeDispatcher.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c b/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c index ca037bf848b..94e060fa193 100644 --- a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c +++ b/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c @@ -1123,11 +1123,13 @@ Java_sun_nio_fs_WindowsNativeDispatcher_GetFullPathName0(JNIEnv *env, JNU_ThrowInternalError(env, "GetFullPathNameW failed"); } free(lpBuf); + } else { + JNU_ThrowOutOfMemoryError(env, "native memory allocation failure"); } } - } - if (len == 0) + } else { throwWindowsException(env, GetLastError()); + } return rv; } @@ -1162,13 +1164,13 @@ Java_sun_nio_fs_WindowsNativeDispatcher_GetFinalPathNameByHandle(JNIEnv* env, JNU_ThrowInternalError(env, "GetFinalPathNameByHandleW failed"); } free(lpBuf); + } else { + JNU_ThrowOutOfMemoryError(env, "native memory allocation failure"); } } - } - - if (len == 0) + } else { throwWindowsException(env, GetLastError()); - + } return rv; }