[[ LinuxServer ]] Fixes parsing of the script files, and overeleasing of the script

livecodesebastien · livecodesebastien · commit b215f78385ca · 2014-06-04T17:27:27.000+01:00
diff --git a/engine/src/exec-server.cpp b/engine/src/exec-server.cpp
@@ -180,7 +180,7 @@ void MCServerExecInclude(MCExecContext& ctxt, MCStringRef p_filename, bool p_is_
 
 void MCServerExecEcho(MCExecContext& ctxt, MCStringRef p_data)
 {
-	if (!MCS_put(ctxt, kMCSPutBinaryOutput, p_data))
+    if (!MCS_put(ctxt, kMCSPutOutput, p_data))
 		MCexitall = True;
 }
 
diff --git a/engine/src/scriptpt.cpp b/engine/src/scriptpt.cpp
@@ -412,9 +412,9 @@ codepoint_t MCScriptPoint::getcodepointatindex(uindex_t p_index)
 {
     uindex_t t_index = 0;
     while (p_index--)
-        MCUnicodeCodepointAdvance((curptr + t_index), endptr - curptr - t_index, t_index);
+        MCUnicodeCodepointAdvance(curptr, endptr - curptr - t_index, t_index);
     
-	return MCUnicodeCodepointAdvance((curptr + t_index), endptr - curptr - t_index, t_index);
+    return MCUnicodeCodepointAdvance(curptr, endptr - curptr - t_index, t_index);
 }
 
 void MCScriptPoint::setcurptr(const unichar_t *ptr)
diff --git a/engine/src/srvscript.cpp b/engine/src/srvscript.cpp
@@ -58,11 +58,16 @@ MCServerScript::~MCServerScript(void)
 		File *t_file;
 		t_file = m_files;
 		m_files = m_files -> next;
-		
-		if (t_file -> handle != NULL)
-			t_file -> handle -> Close();
-		delete t_file -> filename;
-		delete t_file -> script;
+
+        // Closing a MCMemoryMappedFileHandle calls unmap()
+        // and thus deallocates the memory mapped - which is what's stored in t_file -> script
+        if (t_file -> handle != NULL)
+            t_file -> handle -> Close();
+        else
+            delete t_file -> script;
+
+        delete t_file -> filename;
+
 		delete t_file;
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ void MCServerExecInclude(MCExecContext& ctxt, MCStringRef p_filename, bool p_is_`
`180`	`180`
`181`	`181`	`void MCServerExecEcho(MCExecContext& ctxt, MCStringRef p_data)`
`182`	`182`	`{`
`183`		`- if (!MCS_put(ctxt, kMCSPutBinaryOutput, p_data))`
	`183`	`+ if (!MCS_put(ctxt, kMCSPutOutput, p_data))`
`184`	`184`	`MCexitall = True;`
`185`	`185`	`}`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -412,9 +412,9 @@ codepoint_t MCScriptPoint::getcodepointatindex(uindex_t p_index)`
`412`	`412`	`{`
`413`	`413`	`uindex_t t_index = 0;`
`414`	`414`	`while (p_index--)`
`415`		`- MCUnicodeCodepointAdvance((curptr + t_index), endptr - curptr - t_index, t_index);`
	`415`	`+ MCUnicodeCodepointAdvance(curptr, endptr - curptr - t_index, t_index);`
`416`	`416`
`417`		`- return MCUnicodeCodepointAdvance((curptr + t_index), endptr - curptr - t_index, t_index);`
	`417`	`+ return MCUnicodeCodepointAdvance(curptr, endptr - curptr - t_index, t_index);`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`void MCScriptPoint::setcurptr(const unichar_t *ptr)`