From 863596d8bf14a32bed11e71891595c460202b0b9 Mon Sep 17 00:00:00 2001
From: igerasim <unknown>
Date: Mon, 30 Jul 2018 17:09:50 -0700
Subject: [PATCH] 8207060: Memory leak when malloc fails within
 WITH_UNICODE_STRING block Reviewed-by: vtewari, rriggs

---
 src/windows/native/java/io/io_util_md.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/windows/native/java/io/io_util_md.c b/src/windows/native/java/io/io_util_md.c
index 8f777a0a4..03a2bcbc4 100644
--- a/src/windows/native/java/io/io_util_md.c
+++ b/src/windows/native/java/io/io_util_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,9 +169,6 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
                      pathbuf = (WCHAR*)malloc((pathlen + 6) * sizeof(WCHAR));
                      if (pathbuf != 0) {
                          wcscpy(pathbuf, ps);
-                     } else {
-                         JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
-                         return NULL;
                      }
                  }
             } else {
@@ -199,9 +196,6 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
                     pathbuf = (WCHAR*)malloc((pathlen + 6) * sizeof(WCHAR));
                     if (pathbuf != 0) {
                         wcscpy(pathbuf, ps);
-                    } else {
-                        JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
-                        return NULL;
                     }
                 }
             }
@@ -218,9 +212,6 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
             pathbuf = (WCHAR*)malloc(sizeof(WCHAR));
             if (pathbuf != NULL) {
                 pathbuf[0] = L'\0';
-            } else {
-                JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
-                return NULL;
             }
         }
     }
@@ -228,7 +219,6 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
         if (!(*env)->ExceptionCheck(env)) {
             JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
         }
-        return NULL;
     }
     return pathbuf;
 }
-- 
GitLab