handle c exceptions in msLoadMapFromString

DMS-Aus · May 2, 2024 · 6221f9e · 6221f9e
1 parent a60763a
commit 6221f9e
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/mapscript/mapscript.i b/mapscript/mapscript.i
@@ -53,7 +53,9 @@
 %ignore layerObj::extent;
 #endif
 
+#if !defined(WIN32) || !defined(SWIGCSHARP)
 %newobject msLoadMapFromString;
+#endif
 
 %{
 #include "../../mapserver.h"
@@ -333,3 +335,19 @@ typedef struct {
 %include "rbextend.i"
 #endif
 
+#if defined(WIN32) && defined(SWIGCSHARP)
+%inline %{
+// Wrapper function with exception handling
+mapObj *msLoadMapFromString_wrapper(char *buffer, char *new_mappath, const configObj* config) {
+    __try {
+        return msLoadMapFromString(buffer, new_mappath, config);
+    }    
+    __except(EXCEPTION_EXECUTE_HANDLER) {  
+        // Handle the exception here, e.g., set an error message
+        return NULL;
+    }
+}
+%}
+%rename(msLoadMapFromString) msLoadMapFromString_wrapper;
+#endif
+