libscript: Don't attempt to release NULL pointers.

peter-b · peter-b · commit ed9e6d860980 · 2015-02-06T18:28:10.000Z
Prevents a crash when ~MCAutoScriptModuleRef() or
~MCAutoScriptInstanceRef() is called before the contents pointer has
been set.
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -144,6 +144,9 @@ MCScriptInstanceRef MCScriptRetainInstance(MCScriptInstanceRef self)
 
 void MCScriptReleaseInstance(MCScriptInstanceRef self)
 {
+	if (nil == self)
+		return;
+
     __MCScriptValidateObjectAndKind__(self, kMCScriptObjectKindInstance);
     
     MCScriptReleaseObject(self);
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -369,6 +369,9 @@ MCScriptModuleRef MCScriptRetainModule(MCScriptModuleRef self)
 
 void MCScriptReleaseModule(MCScriptModuleRef self)
 {
+	if (nil == self)
+		return;
+
     __MCScriptValidateObjectAndKind__(self, kMCScriptObjectKindModule);
     
     MCScriptReleaseObject(self);

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@ MCScriptInstanceRef MCScriptRetainInstance(MCScriptInstanceRef self)`
`144`	`144`
`145`	`145`	`void MCScriptReleaseInstance(MCScriptInstanceRef self)`
`146`	`146`	`{`
	`147`	`+ if (nil == self)`
	`148`	`+ return;`
	`149`	`+`
`147`	`150`	`__MCScriptValidateObjectAndKind__(self, kMCScriptObjectKindInstance);`
`148`	`151`
`149`	`152`	`MCScriptReleaseObject(self);`
Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,9 @@ MCScriptModuleRef MCScriptRetainModule(MCScriptModuleRef self)`
`369`	`369`
`370`	`370`	`void MCScriptReleaseModule(MCScriptModuleRef self)`
`371`	`371`	`{`
	`372`	`+ if (nil == self)`
	`373`	`+ return;`
	`374`	`+`
`372`	`375`	`__MCScriptValidateObjectAndKind__(self, kMCScriptObjectKindModule);`
`373`	`376`
`374`	`377`	`MCScriptReleaseObject(self);`