mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-2442 fix memory leak of fileBuffer

Browse Source 
fix was suggested by Nikita Gubarkov
This commit is contained in:
Vyacheslav Moklev
2019-02-07 17:28:28 +03:00
committed by alexey.ushakov@jetbrains.com
parent aaee235417
commit ef7d58a9f4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp
View File

@@ -627,6 +627,8 @@ AwtFileDialog::Show(void *p)
peer = (jobject)p;
LPTSTR fileBuffer = NULL;
static BOOL useCommonItemDialog = JNU_CallStaticMethodByName(env, NULL,
"sun/awt/windows/WFileDialogPeer", "useCommonItemDialog", "()Z").z == JNI_TRUE;
try {
@@ -673,7 +675,7 @@ AwtFileDialog::Show(void *p)
} else {
bufferLimit = SINGLE_MODE_BUFFER_LIMIT;
}
LPTSTR fileBuffer = new TCHAR[bufferLimit];
fileBuffer = new TCHAR[bufferLimit];
memset(fileBuffer, 0, bufferLimit * sizeof(TCHAR));
file = (jstring)env->GetObjectField(target, AwtFileDialog::fileID);
@@ -878,8 +880,9 @@ AwtFileDialog::Show(void *p)
env->DeleteGlobalRef(peer);
delete[] currentDirectory;
if (ofn.lpstrFile)
delete[] ofn.lpstrFile;
/* ofn.lpstrFile may have not been set if useCommonItemDialog == true,
* so use fileBuffer instead */
delete[] fileBuffer;
throw;
}
@@ -898,8 +901,9 @@ AwtFileDialog::Show(void *p)
env->DeleteGlobalRef(peer);
delete[] currentDirectory;
if (ofn.lpstrFile)
delete[] ofn.lpstrFile;
/* ofn.lpstrFile may have not been set if useCommonItemDialog == true,
* so use fileBuffer instead */
delete[] fileBuffer;
}
BOOL AwtFileDialog::InheritsNativeMouseWheelBehavior() {return true;}