Prevent memory leaks from rb_raise

rb_raise calls longjmp, which bypasses C++ destructors, and also keeps the error for catch blocks from being unallocated if passed by reference, which we do for exceptions.

Some of the calls I left can still jump out of try blocks, which you're not supposed to do, but there shouldn't be any objects with destructors initialized at those points so it's probably fine.

Author: WaywardHeart

binding/audio-binding.cpp

@@ -25,17 +25,18 @@
 #include "exception.h"
 
 #define DEF_PLAY_STOP_POS(entity) \
-	RB_METHOD(audio_##entity##Play) \
+	RB_METHOD_GUARD(audio_##entity##Play) \
 	{ \
 		RB_UNUSED_PARAM; \
 		const char *filename; \
 		int volume = 100; \
 		int pitch = 100; \
 		double pos = 0.0; \
-        rb_get_args(argc, argv, "z|iif", &filename, &volume, &pitch, &pos RB_ARG_END); \
-		GUARD_EXC( shState->audio().entity##Play(filename, volume, pitch, pos); ) \
+		rb_get_args(argc, argv, "z|iif", &filename, &volume, &pitch, &pos RB_ARG_END); \
+		shState->audio().entity##Play(filename, volume, pitch, pos); \
 		return Qnil; \
 	} \
+	RB_METHOD_GUARD_END \
 	RB_METHOD(audio_##entity##Stop) \
 	{ \
 		RB_UNUSED_PARAM; \
@@ -49,16 +50,17 @@
 	}
 
 #define DEF_PLAY_STOP(entity) \
-	RB_METHOD(audio_##entity##Play) \
+	RB_METHOD_GUARD(audio_##entity##Play) \
 	{ \
 		RB_UNUSED_PARAM; \
 		const char *filename; \
 		int volume = 100; \
 		int pitch = 100; \
 		rb_get_args(argc, argv, "z|ii", &filename, &volume, &pitch RB_ARG_END); \
-		GUARD_EXC( shState->audio().entity##Play(filename, volume, pitch); ) \
+		shState->audio().entity##Play(filename, volume, pitch); \
 		return Qnil; \
 	} \
+	RB_METHOD_GUARD_END \
 	RB_METHOD(audio_##entity##Stop) \
 	{ \
 		RB_UNUSED_PARAM; \
@@ -87,7 +89,7 @@ RB_METHOD(audio_##entity##Fade) \
 
 #define MAYBE_NIL_TRACK(t) t == Qnil ? -127 : NUM2INT(t)
 
-RB_METHOD(audio_bgmPlay)
+RB_METHOD_GUARD(audio_bgmPlay)
 {
     RB_UNUSED_PARAM;
     const char *filename;
@@ -96,9 +98,10 @@ RB_METHOD(audio_bgmPlay)
     double pos = 0.0;
     VALUE track = Qnil;
     rb_get_args(argc, argv, "z|iifo", &filename, &volume, &pitch, &pos, &track RB_ARG_END);
-    GUARD_EXC( shState->audio().bgmPlay(filename, volume, pitch, pos, MAYBE_NIL_TRACK(track)); )
+    shState->audio().bgmPlay(filename, volume, pitch, pos, MAYBE_NIL_TRACK(track));
     return Qnil;
 }
+RB_METHOD_GUARD_END
 
 RB_METHOD(audio_bgmStop)
 {
@@ -117,25 +120,27 @@ RB_METHOD(audio_bgmPos)
     return rb_float_new(shState->audio().bgmPos(MAYBE_NIL_TRACK(track)));
 }
 
-RB_METHOD(audio_bgmGetVolume)
+RB_METHOD_GUARD(audio_bgmGetVolume)
 {
     RB_UNUSED_PARAM;
     VALUE track = Qnil;
     rb_get_args(argc, argv, "|o", &track RB_ARG_END);
     int ret = 0;
-    GUARD_EXC( ret = shState->audio().bgmGetVolume(MAYBE_NIL_TRACK(track)); )
+    ret = shState->audio().bgmGetVolume(MAYBE_NIL_TRACK(track));
     return rb_fix_new(ret);
 }
+RB_METHOD_GUARD_END
 
-RB_METHOD(audio_bgmSetVolume)
+RB_METHOD_GUARD(audio_bgmSetVolume)
 {
     RB_UNUSED_PARAM;
     int volume;
     VALUE track = Qnil;
     rb_get_args(argc, argv, "i|o", &volume, &track RB_ARG_END);
-    GUARD_EXC( shState->audio().bgmSetVolume(volume, MAYBE_NIL_TRACK(track)); )
+    shState->audio().bgmSetVolume(volume, MAYBE_NIL_TRACK(track));
     return Qnil;
 }
+RB_METHOD_GUARD_END
 
 DEF_PLAY_STOP_POS( bgs )
 

binding/binding-mri.cpp

@@ -528,14 +528,15 @@ RB_METHOD(mkxpSystemMemory) {
     return INT2NUM(SDL_GetSystemRAM());
 }
 
-RB_METHOD(mkxpReloadPathCache) {
+RB_METHOD_GUARD(mkxpReloadPathCache) {
     RB_UNUSED_PARAM;
 
-    GUARD_EXC(shState->fileSystem().reloadPathCache(););
+    shState->fileSystem().reloadPathCache();
     return Qnil;
 }
+RB_METHOD_GUARD_END
 
-RB_METHOD(mkxpAddPath) {
+RB_METHOD_GUARD(mkxpAddPath) {
     RB_UNUSED_PARAM;
 
     VALUE path, mountpoint, reload;
@@ -545,36 +546,32 @@ RB_METHOD(mkxpAddPath) {
 
     const char *mp = (mountpoint == Qnil) ? 0 : RSTRING_PTR(mountpoint);
 
-    try {
-        bool rl = true;
-        if (reload != Qnil)
-            rb_bool_arg(reload, &rl);
-        
-        shState->fileSystem().addPath(RSTRING_PTR(path), mp, rl);
-    } catch (Exception &e) {
-        raiseRbExc(e);
-    }
+    bool rl = true;
+    if (reload != Qnil)
+        rb_bool_arg(reload, &rl);
+    
+    shState->fileSystem().addPath(RSTRING_PTR(path), mp, rl);
+    
     return path;
 }
+RB_METHOD_GUARD_END
 
-RB_METHOD(mkxpRemovePath) {
+RB_METHOD_GUARD(mkxpRemovePath) {
     RB_UNUSED_PARAM;
 
     VALUE path, reload;
     rb_scan_args(argc, argv, "11", &path, &reload);
     SafeStringValue(path);
 
-    try {
-        bool rl = true;
-        if (reload != Qnil)
-            rb_bool_arg(reload, &rl);
-        
-        shState->fileSystem().removePath(RSTRING_PTR(path), rl);
-    } catch (Exception &e) {
-        raiseRbExc(e);
-    }
+    bool rl = true;
+    if (reload != Qnil)
+        rb_bool_arg(reload, &rl);
+    
+    shState->fileSystem().removePath(RSTRING_PTR(path), rl);
+    
     return path;
 }
+RB_METHOD_GUARD_END
 
 RB_METHOD(mkxpFileExists) {
     RB_UNUSED_PARAM;
@@ -601,24 +598,25 @@ RB_METHOD(mkxpSetDefaultFontFamily) {
     return Qnil;
 }
 
-RB_METHOD(mkxpStringToUTF8) {
+RB_METHOD_GUARD(mkxpStringToUTF8) {
     RB_UNUSED_PARAM;
 
     rb_check_argc(argc, 0);
 
     std::string ret(RSTRING_PTR(self), RSTRING_LEN(self));
-    GUARD_EXC(ret = Encoding::convertString(ret); );
+    ret = Encoding::convertString(ret);
 
     return rb_utf8_str_new(ret.c_str(), ret.length());
 }
+RB_METHOD_GUARD_END
 
-RB_METHOD(mkxpStringToUTF8Bang) {
+RB_METHOD_GUARD(mkxpStringToUTF8Bang) {
     RB_UNUSED_PARAM;
 
     rb_check_argc(argc, 0);
 
     std::string ret(RSTRING_PTR(self), RSTRING_LEN(self));
-    GUARD_EXC(ret = Encoding::convertString(ret); );
+    ret = Encoding::convertString(ret);
 
     rb_str_resize(self, ret.length());
     memcpy(RSTRING_PTR(self), ret.c_str(), RSTRING_LEN(self));
@@ -629,6 +627,7 @@ RB_METHOD(mkxpStringToUTF8Bang) {
 
     return self;
 }
+RB_METHOD_GUARD_END
 
 #ifdef __APPLE__
 #define OPENCMD "open "
@@ -641,7 +640,7 @@ RB_METHOD(mkxpStringToUTF8Bang) {
 #define OPENARGS ""
 #endif
 
-RB_METHOD(mkxpLaunch) {
+RB_METHOD_GUARD(mkxpLaunch) {
     RB_UNUSED_PARAM;
 
     VALUE cmdname, args;
@@ -674,11 +673,12 @@ RB_METHOD(mkxpLaunch) {
     }
 
     if (std::system(command.c_str()) != 0) {
-        raiseRbExc(Exception(Exception::MKXPError, "Failed to launch \"%s\"", RSTRING_PTR(cmdname)));
+        throw Exception(Exception::MKXPError, "Failed to launch \"%s\"", RSTRING_PTR(cmdname));
     }
 
     return RUBY_Qnil;
 }
+RB_METHOD_GUARD_END
 
 json5pp::value loadUserSettings() {
     json5pp::value ret;
@@ -722,7 +722,7 @@ RB_METHOD(mkxpGetJSONSetting) {
 
 }
 
-RB_METHOD(mkxpSetJSONSetting) {
+RB_METHOD_GUARD(mkxpSetJSONSetting) {
     RB_UNUSED_PARAM;
 
     VALUE sname, svalue;
@@ -736,6 +736,7 @@ RB_METHOD(mkxpSetJSONSetting) {
 
     return Qnil;
 }
+RB_METHOD_GUARD_END
 
 RB_METHOD(mkxpGetAllJSONSettings) {
     RB_UNUSED_PARAM;