stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8207145: (fs) Native memory leak in WindowsNativeDispatcher.LookupPrivilegeValue0

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Ivan Gerasimov 2018-07-12 06:04:57 -07:00
parent 1c976267be
commit 78f3c8a7d4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -102,9 +102,8 @@ class WindowsSecurity {
final boolean stopImpersontating = impersontating; final boolean stopImpersontating = impersontating;
final boolean needToRevert = elevated; final boolean needToRevert = elevated;
return new Privilege() { return () -> {
@Override try {
public void drop() {
if (token != 0L) { if (token != 0L) {
try { try {
if (stopImpersontating) if (stopImpersontating)
@ -118,6 +117,8 @@ class WindowsSecurity {
CloseHandle(token); CloseHandle(token);
} }
} }
} finally {
LocalFree(pLuid);
} }
}; };
} }

7
src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1043,8 +1043,11 @@ Java_sun_nio_fs_WindowsNativeDispatcher_LookupPrivilegeValue0(JNIEnv* env,
if (pLuid == NULL) { if (pLuid == NULL) {
JNU_ThrowInternalError(env, "Unable to allocate LUID structure"); JNU_ThrowInternalError(env, "Unable to allocate LUID structure");
} else { } else {
if (LookupPrivilegeValueW(NULL, lpName, pLuid) == 0) if (LookupPrivilegeValueW(NULL, lpName, pLuid) == 0) {
LocalFree(pLuid);
throwWindowsException(env, GetLastError()); throwWindowsException(env, GetLastError());
return (jlong)0;
}
} }
return ptr_to_jlong(pLuid); return ptr_to_jlong(pLuid);
} }