[[ LinuxServer ]] Fixes Pango font crash and $_* variable parsing

livecodesebastien · livecodesebastien · commit 93d78511513d · 2014-06-05T17:24:02.000+01:00
diff --git a/Server.files b/Server.files
@@ -288,6 +288,7 @@ engine/src/lnxprefix.h
 engine/src/lnxpsprinter.h
 engine/src/lnxtheme.h
 engine/src/lnxtransfer.h
+engine/src/lnxtxt.cpp
 engine/src/magnify.h
 engine/src/mblad.h
 engine/src/mblandroidcontrol.h
@@ -417,7 +418,6 @@ engine/src/w32text.h
 engine/src/w32theme.h
 engine/src/w32transfer.h
 
-
 libfoundation/include/foundation-auto.h
 libfoundation/include/foundation-inline.h
 libfoundation/include/foundation-locale.h
@@ -444,6 +444,23 @@ libfoundation/src/foundation-unicode.cpp
 libfoundation/src/foundation-unicode-private.h
 libfoundation/src/foundation-value.cpp
 
+libgraphics/include/graphics.h
+libgraphics/src/blur.cpp
+libgraphics/src/cachetable.cpp
+libgraphics/src/context.cpp
+libgraphics/src/graphics-internal.h
+libgraphics/src/image.cpp
+libgraphics/src/legacyblendmodes.cpp
+libgraphics/src/legacygradients.cpp
+libgraphics/src/lnxtext.cpp
+libgraphics/src/mblandroidtext.cpp
+libgraphics/src/mbliphonetext.mm
+libgraphics/src/osxtext.cpp
+libgraphics/src/path.cpp
+libgraphics/src/spread.cpp
+libgraphics/src/utils.cpp
+libgraphics/src/w32text.cpp
+
 Makefile
 engine/Makefile.standalone
 engine/Makefile.server
diff --git a/Server.includes b/Server.includes
@@ -5,6 +5,9 @@ libexternal/include/revolution
 libexternalv1/include
 libfoundation/include
 libfoundation/src
+libgraphics/include
+libexternal/include
+libexternalv1/include
 revbrowser/src
 revdb/src
 revfont/src
diff --git a/engine/src/srvcgi.cpp b/engine/src/srvcgi.cpp
@@ -663,7 +663,7 @@ static void cgi_store_data_urlencoded(MCVariable *p_variable, MCDataRef p_data,
         /* UNCHECKED */ MCNameCreate(*t_key_as_string, &t_key_as_name);
 
         uindex_t t_encoded_value_end;
-        t_encoded_value_end = t_delimiter_index - 1;
+        t_encoded_value_end = t_delimiter_index;
 		
 		if (p_remove_whitespace)
             while (t_encoded_value_end > t_encoded_value_index && MCDataGetByteAtIndex(p_data, t_encoded_value_end) == ' ')
diff --git a/libfoundation/src/foundation-string.cpp b/libfoundation/src/foundation-string.cpp
@@ -814,6 +814,10 @@ bool MCStringCopySubstring(MCStringRef self, MCRange p_range, MCStringRef& r_sub
     if (__MCStringIsIndirect(self))
         self = self -> string;
     
+    // Avoid copying in case the substring is actually the whole string
+    if (p_range . offset == 0 && self -> char_count < p_range . length)
+        return MCStringCopy(self, r_substring);
+
 	__MCStringClampRange(self, p_range);
 	
     if (MCStringIsNative(self))
diff --git a/libgraphics/src/lnxtext.cpp b/libgraphics/src/lnxtext.cpp
@@ -79,12 +79,13 @@ static bool lnx_pango_initialize(void)
 
 static void lnx_pango_finalize(void)
 {
-	if (s_layout != NULL)
-		g_object_unref(s_layout);
-	if (s_pango != NULL)
-		g_object_unref(s_pango);
-	if (s_font_map != NULL)
-		g_object_unref(s_font_map);
+    if (s_layout != NULL)
+        g_object_unref(s_layout);
+    if (s_pango != NULL)
+        g_object_unref(s_pango);
+    // Causes a SIGSERV on linux server
+//    if (s_font_map != NULL)
+//        g_object_unref(s_font_map);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
