Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk

changeset 9288:de395dde0d4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8035855: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp Reviewed-by: anthony, serb
author pchelko
date Mon, 31 Mar 2014 14:28:47 +0400
parents f0d3a72a7289
children 6f4ae5683b93
files src/windows/native/sun/windows/awt_DataTransferer.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_DataTransferer.cpp	Sat Mar 29 12:29:21 2014 +0400
+++ b/src/windows/native/sun/windows/awt_DataTransferer.cpp	Mon Mar 31 14:28:47 2014 +0400
@@ -274,6 +274,9 @@
 
         jclass str_clazz = env->FindClass("java/lang/String");
         DASSERT(str_clazz != NULL);
+        if (str_clazz == NULL) {
+           throw std::bad_alloc();
+        }
         jobjectArray filenames = env->NewObjectArray(nFilenames, str_clazz,
                                                      NULL);
         if (filenames == NULL) {
@@ -827,6 +830,7 @@
     TRY;
 
     LPCTSTR cStr = JNU_GetStringPlatformChars(env, str, NULL);
+    CHECK_NULL_RETURN(cStr, 0);
     jlong value = ::RegisterClipboardFormat(cStr);
     JNU_ReleaseStringPlatformChars(env, str, cStr);