From 829c537fd31e1afce16d937bda8f02f6a27a7f64 Mon Sep 17 00:00:00 2001 From: John Platts Date: Mon, 19 Sep 2022 13:55:33 -0500 Subject: [PATCH] Add checks for allocation failure --- .../flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp index 12758ebd..c54b6268 100644 --- a/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp +++ b/flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp @@ -117,10 +117,14 @@ HWND FlatWndProc::install( JNIEnv *env, jobject obj, jobject window ) { return 0; FlatWndProc* fwp = new (FlatLafNoThrow) FlatWndProc(); + if(fwp == NULL) + return 0; + env->GetJavaVM( &fwp->jvm ); fwp->obj = env->NewGlobalRef( obj ); fwp->hwnd = hwnd; - hwndMap->put( hwnd, fwp ); + if(!hwndMap->put( hwnd, fwp )) + return 0; // replace window procedure fwp->defaultWndProc = reinterpret_cast(