Fix exception handling in event handlers (#8005)

audacity · Jan 19, 2025 · 5796d98 · 5796d98
1 parent 7f75482
commit 5796d98
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/config/packages/wxwidgets.yml b/config/packages/wxwidgets.yml
@@ -1,5 +1,5 @@
 config:
-  version: 3.1.3.5-audacity
+  version: 3.1.3.6-audacity
   options: |
     libtiff/*:lzma=False
     libtiff/*:jpeg=libjpeg-turbo

diff --git a/recipes/wxwidgets/3.1.3/conandata.yml b/recipes/wxwidgets/3.1.3/conandata.yml
@@ -21,6 +21,11 @@ sources:
     - https://github.com/audacity/wxWidgets/archive/v3.1.3.1-audacity.tar.gz
     - https://artifactory.audacityteam.org/artifactory/mirror/wxwidgets/3.1.3.4-audacity/v3.1.3.1-audacity.tar.gz
     sha256: bc62edab621cf0a568ce6716407d5090701c09b57335044f92066b302bb70d1d
+  3.1.3.6-audacity:
+    url:
+    - https://github.com/audacity/wxWidgets/archive/v3.1.3.1-audacity.tar.gz
+    - https://artifactory.audacityteam.org/artifactory/mirror/wxwidgets/3.1.3.4-audacity/v3.1.3.1-audacity.tar.gz
+    sha256: bc62edab621cf0a568ce6716407d5090701c09b57335044f92066b302bb70d1d
 
 patches:
   3.1.3-audacity:
@@ -43,3 +48,10 @@ patches:
   - patch_file: patches/regex_lib_cocoa_patch.patch
   - patch_file: patches/win_arm64.patch
   - patch_file: patches/0001-Fix-wxWindowDisabler-does-not-start-a-modal-session.patch
+  3.1.3.6-audacity:
+  - patch_file: patches/d9deaa8b76128613a84f3d085eb1e4b05631083a.patch
+  - patch_file: patches/fix-cocoa-process.diff
+  - patch_file: patches/regex_lib_cocoa_patch.patch
+  - patch_file: patches/win_arm64.patch
+  - patch_file: patches/0001-Fix-wxWindowDisabler-does-not-start-a-modal-session.patch
+  - patch_file: patches/0001-Don-t-let-exceptions-escape-from-events.patch
diff --git a/recipes/wxwidgets/3.1.3/patches/0001-Don-t-let-exceptions-escape-from-events.patch b/recipes/wxwidgets/3.1.3/patches/0001-Don-t-let-exceptions-escape-from-events.patch
@@ -0,0 +1,16 @@
+diff --git a/src/common/event.cpp b/src/common/event.cpp
+index d10275b49b..466b1e5827 100644
+--- a/src/common/event.cpp
++++ b/src/common/event.cpp
+@@ -1379,7 +1379,10 @@ void wxEvtHandler::ProcessPendingEvents()
+
+     wxLEAVE_CRIT_SECT( m_pendingEventsLock );
+
+-    ProcessEvent(*event);
++    // We must not let exceptions escape from here, there is no outer exception
++    // handler to catch them and so letting them do it would just terminate the
++    // program.
++    SafelyProcessEvent(*event);
+
+     // careful: this object could have been deleted by the event handler
+     // executed by the above ProcessEvent() call, so we can't access any fields
diff --git a/recipes/wxwidgets/config.yml b/recipes/wxwidgets/config.yml
@@ -11,3 +11,5 @@ versions:
     folder: "3.1.3"
   "3.1.3.5-audacity":
     folder: "3.1.3"
+  "3.1.3.6-audacity":
+    folder: "3.1.3"