File 0182-wx-Delete-DC-references.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0182-wx-Delete-DC-references.patch of Package erlang (Revision e580c2dc40e2c054a5be6bebabbc6148)

Currently displaying revision e580c2dc40e2c054a5be6bebabbc6148 , Show latest

From 131c480da9e46198322dfebf4b3c238ee6a8e36e Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Fri, 12 Nov 2021 10:42:02 +0100
Subject: [PATCH 2/4] wx: Delete DC references

When cleaning up delete all DC's in the pre-pass,
caused a crash in testing on wxWidgets-3.1.4 on sunos.
---
 lib/wx/c_src/wxe_impl.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 2938fcee81..b804229610 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -546,8 +546,8 @@ void WxeApp::destroyMemEnv(wxeMetaCommand &Ecmd)
     send_msg("debug", &msg);
   }
 
-  // pre-pass delete all dialogs first since they might crash erlang otherwise
-  for(int i=1; i < memenv->next; i++) {
+  // pre-pass delete all dialogs and DC's first since they might crash erlang otherwise
+  for(int i=memenv->next-1; i > 0; i--) {
     wxObject * ptr = (wxObject *) memenv->ref2ptr[i];
     if(ptr) {
       ptrMap::iterator it = ptr2ref.find(ptr);
@@ -555,23 +555,22 @@ void WxeApp::destroyMemEnv(wxeMetaCommand &Ecmd)
 	wxeRefData *refd = it->second;
 	if(refd->alloc_in_erl && refd->type == 2) {
 	  wxDialog *win = (wxDialog *) ptr;
-	  if(win->IsModal()) {
-	    win->EndModal(-1);
-	  }
+	  if(win->IsModal()) { win->EndModal(-1); }
 	  parent = win->GetParent();
 	  if(parent) {
 	    ptrMap::iterator parentRef = ptr2ref.find(parent);
-	    if(parentRef == ptr2ref.end()) {
-	      // The parent is already dead delete the parent ref
-	      win->SetParent(NULL);
-	    }
-	  }
-	  if(recurse_level > 0) {
-	    // Delay delete until we are out of dispatch*
-	  } else {
-	    delete win;
+            // if the parent is already dead delete the parent ref
+	    if(parentRef == ptr2ref.end()) { win->SetParent(NULL); }
 	  }
-	}
+          // Delay delete until we are out of dispatch*
+	  if(recurse_level == 0) { delete win; }
+	} else if(refd->alloc_in_erl && refd->type == 8) {
+	  if(delete_object(ptr, refd)) {
+	    // Delete refs for leaks and non overridden allocs
+	    delete refd;
+	    ptr2ref.erase(it);
+          }
+        }
       }
     }
   }
-- 
2.31.1

Places

File 0182-wx-Delete-DC-references.patch of Package erlang (Revision e580c2dc40e2c054a5be6bebabbc6148)

Places