Merge remote-tracking branch 'origin/develop-8.1' into merge-develop-8.1_30.05.17

livecodeali · livecodeali · commit f5ce5aa69b25 · 2017-05-30T17:06:01.000+01:00
diff --git a/docs/development/testing.md b/docs/development/testing.md
@@ -72,7 +72,7 @@ Before running each test command, the test framework inserts a test library stac
 	- `pTarget` is the object to which `pHandlerName` should be dispatched.
 	- `pTimeOut` is the amount of milliseconds to continue testing the result of the handler.
 	- `pParamsArray` is an array of parameters, keyed by the 1-based index of the required parameter to be passed to the handler.
-
+* `TestAssertErrorDialog pDescription, pErrorCode`: Assert that this test triggers an errorDialog message with the given error.
 Tests can have additional setup requirements before running, for example loading custom libraries. If the script test contains a handler called `TestSetup`, this will be run prior to running each test command. For example:
 ````
 on TestSetup
diff --git a/docs/notes/bugfix-17969.md b/docs/notes/bugfix-17969.md
@@ -0,0 +1 @@
+# Fixed bug preventing correct rendering of ovals when creating them
diff --git a/docs/notes/bugfix-18670.md b/docs/notes/bugfix-18670.md
@@ -0,0 +1 @@
+# Fixed bug preventing all table names being retrieved in MySQL db's
diff --git a/docs/notes/bugfix-19699.md b/docs/notes/bugfix-19699.md
@@ -0,0 +1 @@
+# Fixed bug that overrides previous matches in matchText
diff --git a/docs/notes/bugfix-19742.md b/docs/notes/bugfix-19742.md
@@ -0,0 +1 @@
+# Fix crash when deleting an object when a socket has a reference to a deleted object
diff --git a/docs/notes/bugfix-19743.md b/docs/notes/bugfix-19743.md
@@ -0,0 +1 @@
+# Fix crash when checking a watched variable on a deleted object
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -395,6 +395,9 @@ void MCButton::removelink(MCObject *optr)
 {
 	if (menu.IsBound() && optr == menu)
     {
+        if (this == MCmenuobjectptr)
+            MCmenuobjectptr = nil;
+        
         MCValueAssign(menuname, kMCEmptyName);
         menu = nil;
     }
diff --git a/engine/src/funcs.cpp b/engine/src/funcs.cpp
@@ -1357,23 +1357,24 @@ void MCMatch::eval_ctxt(MCExecContext &ctxt, MCExecValue &r_value)
         MCStringsEvalMatchText(ctxt, *t_source, *t_pattern, *t_results, t_result_count, r_value . bool_value);
     r_value .type = kMCExecValueTypeBool;
     
-    if (!ctxt.HasError())
+    if (!r_value . bool_value || ctxt . HasError())
     {
-        for (uindex_t i = 0; i < t_result_count; i++)
-        {
-            // AL-2014-09-09: [[ Bug 13359 ]] Make sure containers are used in case a param is a handler variable
-            // AL-2014-09-18: [[ Bug 13465 ]] Use auto class to prevent memory leak
-            MCContainer t_container;
-            if (!t_result_params->evalcontainer(ctxt, t_container))
-            {
-                ctxt . LegacyThrow(EE_MATCH_BADDEST);
-                return;
-            }
-
-            /* UNCHECKED */ t_container.set_valueref(t_results[i]);
-            
-            t_result_params = t_result_params->getnext();
-        }
+        return;
+    }
+    
+    for (uindex_t i = 0; i < t_result_count; i++)
+    {
+        // AL-2014-09-09: [[ Bug 13359 ]] Make sure containers are used in case a param is a handler variable
+		MCContainer t_container;
+		if (!t_result_params->evalcontainer(ctxt, t_container))
+		{
+			ctxt . LegacyThrow(EE_MATCH_BADDEST);
+			return;
+		}
+		
+        /* UNCHECKED */ t_container.set_valueref(t_results[i]);
+        
+        t_result_params = t_result_params->getnext();
     }
 }
 
diff --git a/engine/src/mcio.cpp b/engine/src/mcio.cpp
@@ -161,7 +161,9 @@ real8 IO_cleansockets(real8 ctime)
 					s->revents->timeout = ctime + MCsockettimeout;
 				if (s->wevents != NULL)
 					s->wevents->timeout = ctime + MCsockettimeout;
-				MCscreen->delaymessage(s->object, MCM_socket_timeout, MCNameGetString(s->name));
+                
+                if (s->object.IsValid())
+                    MCscreen->delaymessage(s->object, MCM_socket_timeout, MCNameGetString(s->name));
 			}
 			if (s->wevents != NULL && s->wevents->timeout < etime)
 				etime = s->wevents->timeout;
@@ -187,7 +189,8 @@ void IO_freeobject(MCObject *o)
 	while (i < MCnsockets)
 #if 1
 	{
-		if (MCsockets[i]->object == o)
+		if (!MCsockets[i]->object.IsValid() ||
+            MCsockets[i]->object == o)
 			MCsockets[i]->doclose();
 		i++;
 	}
diff --git a/engine/src/uidc.cpp b/engine/src/uidc.cpp
@@ -937,7 +937,9 @@ Boolean MCUIDC::wait(real8 duration, Boolean dispatch, Boolean anyevent)
 		DoRunloopActions();
 
 		real8 eventtime = exittime;
-		donepending = handlepending(curtime, eventtime, dispatch);
+        donepending = handlepending(curtime, eventtime, dispatch) ||
+            (dispatch && MCEventQueueDispatch());
+        
 		siguser();
         
 		MCModeQueueEvents();
diff --git a/engine/src/variable.cpp b/engine/src/variable.cpp
@@ -1059,7 +1059,7 @@ void MCVariable::synchronize(MCExecContext& ctxt, bool p_notify)
 		uint2 i;
 		for (i = 0 ; i < MCnwatchedvars ; i++)
 		{
-			if ((!MCwatchedvars[i].object.IsBound() || MCwatchedvars[i].object == ctxt.GetObject()) 
+			if ((!MCwatchedvars[i].object.IsValid() || MCwatchedvars[i].object == ctxt.GetObject())
 				&& (!MCwatchedvars[i].handlername.IsSet() 
 					|| (ctxt.GetHandler() != nil && ctxt.GetHandler()->hasname(*MCwatchedvars[i].handlername)))
 				&& hasname(*MCwatchedvars[i].varname))
diff --git a/libgraphics/src/path.cpp b/libgraphics/src/path.cpp
@@ -487,8 +487,8 @@ void MCGPathAddArc(MCGPathRef self, MCGPoint p_center, MCGSize p_radii, MCGFloat
 		{
 			// Use Skia implementation
 			SkRect t_bounds;
-			t_bounds = SkRect::MakeXYWH(MCGCoordToSkCoord(p_center . x - p_radii . width), MCGCoordToSkCoord(p_center . y - p_radii . height),
-			                            MCGFloatToSkScalar(p_radii . width * 2), MCGFloatToSkScalar(p_radii . height * 2));
+			t_bounds = SkRect::MakeXYWH(MCGCoordToSkCoord(p_center . x - (p_radii . width * 0.5f)), MCGCoordToSkCoord(p_center . y - (p_radii . height * 0.5f)),
+			                            MCGFloatToSkScalar(p_radii . width), MCGFloatToSkScalar(p_radii . height));
 			self -> path -> addArc(t_bounds, MCGFloatToSkScalar(p_start_angle), MCGFloatToSkScalar(p_finish_angle - p_start_angle));
 		}
 	}
diff --git a/prebuilt/scripts/lib_versions.inc b/prebuilt/scripts/lib_versions.inc
@@ -2,8 +2,8 @@
 
 script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-OpenSSL_VERSION=$(cat ${script_dir}/../versions/openssl)
-ICU_VERSION=$(cat ${script_dir}/../versions/icu)
-ICU_VERSION_MAJOR=$(cat ${script_dir}/../versions/icu_major)
-Curl_VERSION=$(cat ${script_dir}/../versions/curl)
-CEF_VERSION=$(cat ${script_dir}/../versions/cef)
+OpenSSL_VERSION=$(cat "${script_dir}/../versions/openssl")
+ICU_VERSION=$(cat "${script_dir}/../versions/icu")
+ICU_VERSION_MAJOR=$(cat "${script_dir}/../versions/icu_major")
+Curl_VERSION=$(cat "${script_dir}/../versions/curl")
+CEF_VERSION=$(cat "${script_dir}/../versions/cef")
diff --git a/revdb/src/dbmysql.h b/revdb/src/dbmysql.h
@@ -19,6 +19,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include "dbdrivercommon.h"
+#include "large_buffer.h"
 
 #include <mysql.h>
 #include <mysql_com.h>
@@ -66,6 +67,7 @@ class DBConnection_MYSQL: public CDBConnection
 	void getTables(char *buffer, int *bufsize);
 	int getConnectionType(void) { return -1; }
 	int getVersion(void) { return 2; }
+    large_buffer_t *m_internal_buffer;
 protected:
 	bool BindVariables(MYSQL_STMT *p_statement, DBString *p_arguments, int p_argument_count, int *p_placeholders, int p_placeholder_count, MYSQL_BIND **p_bind);
 	bool ExecuteQuery(char *p_query, DBString *p_arguments, int p_argument_count);
diff --git a/revdb/src/dbpostgresql.h b/revdb/src/dbpostgresql.h
@@ -26,6 +26,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include <libpq-fe.h>
 #include "dbdrivercommon.h"
+#include "large_buffer.h"
 
 #define DB_POSTGRESQL_STRING "POSTGRESQL";
 
@@ -139,5 +140,7 @@ class DBConnection_POSTGRESQL: public CDBConnection
 protected:
 	PGconn *dbconn;
 	PGresult *ExecuteQuery(char *p_query, DBString *p_arguments, int p_argument_count);
+private:
+    large_buffer_t *m_internal_buffer;
 };
 #endif
diff --git a/revdb/src/large_buffer.h b/revdb/src/large_buffer.h
@@ -17,6 +17,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef __LARGE_BUFFER__
 #define __LARGE_BUFFER__
 
+#include "stddef.h"
+
 class large_buffer_t
 {
 public:
@@ -48,10 +50,20 @@ class large_buffer_t
 		m_frontier = m_frontier + p_length;
 	}
 
+    void *ptr(void)
+    {
+        return m_data;
+    }
+    
+    ptrdiff_t length(void)
+    {
+        return m_frontier - m_data;
+    }
+    
 	void grab(void*& r_data, unsigned int& r_length)
 	{
 		r_length = m_frontier - m_data;
-		r_data = (void *)realloc(m_data, m_frontier - m_data);
+		r_data = (void *)realloc(m_data, r_length);
 		
 		m_data = NULL;
 		m_frontier = NULL;
diff --git a/revdb/src/mysql_connection.cpp b/revdb/src/mysql_connection.cpp
@@ -379,38 +379,38 @@ bool DBConnection_MYSQL::BindVariables(MYSQL_STMT *p_statement, DBString *p_argu
 
 void DBConnection_MYSQL::getTables(char *buffer, int *bufsize)
 {
-	int rowseplen = 1;
-	char rowsep[] = "\n";
 	if (!buffer) {
-		*bufsize = 2500;
+        if (!m_internal_buffer)
+        {
+            m_internal_buffer = new large_buffer_t;
+            
+        }
+        long buffersize = 0;
+        char tsql[] = "SHOW tables";
+        DBCursor *newcursor = sqlQuery(tsql, NULL, 0, 0);
+        if (newcursor) {
+            if (!newcursor->getEOF()){
+                while (True){
+                    unsigned int colsize;
+                    char *coldata = newcursor->getFieldDataBinary(1,colsize);
+                    colsize = strlen(coldata);
+                    m_internal_buffer->append(coldata, colsize);
+                    m_internal_buffer->append('\n');
+                    buffersize += colsize + 1;
+                    newcursor->next();
+                    if (newcursor->getEOF()) break;
+                }
+            }
+            deleteCursor(newcursor->GetID());
+            *bufsize = buffersize+1;
+            m_internal_buffer->append('\0');
+            fprintf(stderr, "\n%d\n", *bufsize);
+        }
 		return;
 	}
-	char tsql[] = "SHOW tables";
-	DBCursor *newcursor = sqlQuery(tsql, NULL, 0, 0);
-	if (newcursor) {
-		char *result = buffer;
-		char *resultptr = result;
-		if (!newcursor->getEOF()){
-			while (True){
-				unsigned int colsize;
-				char *coldata = newcursor->getFieldDataBinary(1,colsize);
-				colsize = strlen(coldata);
-				if (((resultptr-result) + colsize + rowseplen + 16 ) 
-					> *bufsize)
-					break;
-				memcpy(resultptr,coldata,colsize);
-				resultptr+=colsize;
-				newcursor->next();
-				if (newcursor->getEOF()) break;
-				memcpy(resultptr,rowsep,rowseplen);
-				resultptr+=rowseplen;
-			}
-		}
-		deleteCursor(newcursor->GetID());
-		*resultptr++ = '\0';
-		*bufsize = resultptr-result;
-	}
-	newcursor = NULL;
+    memcpy((void *) buffer, m_internal_buffer->ptr(), m_internal_buffer->length());
+    delete m_internal_buffer;
+    m_internal_buffer = nullptr;
 }
 
 /*MYSQL doesn't support transactions so leave blank for now*/
diff --git a/revdb/src/postgresql_connection.cpp b/revdb/src/postgresql_connection.cpp
@@ -439,39 +439,42 @@ char *DBConnection_POSTGRESQL::getErrorMessage(Bool p_last)
 
 void DBConnection_POSTGRESQL::getTables(char *buffer, int *bufsize)
 {
-	int rowseplen = 1;
-	char rowsep[] = "\n";
-	if (!buffer) {
-		*bufsize = 2500;
-		return;
-	}
-	char tsql[] = "SELECT tablename FROM pg_tables WHERE tablename NOT LIKE 'pg%'";
-	DBCursor *newcursor = sqlQuery(tsql , NULL, 0, 0);
-	if (newcursor)
-	{
-		char *result = buffer;
-		char *resultptr = result;
-		if (!newcursor->getEOF())
-		{
-			while (True){
-				unsigned int colsize;
-				char *coldata = newcursor->getFieldDataBinary(1,colsize);
-				colsize = strlen(coldata);
-				if (((resultptr-result) + (int)colsize + rowseplen + 16 ) > *bufsize)
-					break;
-				memcpy(resultptr,coldata,colsize);
-				resultptr+=colsize;
-				newcursor->next();
-				if (newcursor->getEOF()) break;
-				memcpy(resultptr,rowsep,rowseplen);
-				resultptr+=rowseplen;
-			}
-		}
-		deleteCursor(newcursor->GetID());
-		*resultptr++ = '\0';
-		*bufsize = resultptr-result;
-	}
-	newcursor = NULL;
+	if (!buffer)
+    {
+        if (!m_internal_buffer)
+        {
+            m_internal_buffer = new large_buffer_t;
+        }
+        
+        long buffersize = 0;
+        char tsql[] = "SELECT tablename FROM pg_tables WHERE tablename NOT LIKE 'pg%'";
+        DBCursor *newcursor = sqlQuery(tsql, NULL, 0, 0);
+        if (newcursor) 
+        {
+            if (!newcursor->getEOF())
+            {
+                while (True)
+                {
+                    unsigned int colsize;
+                    char *coldata = newcursor->getFieldDataBinary(1,colsize);
+                    colsize = strlen(coldata);
+                    m_internal_buffer->append(coldata, colsize);
+                    m_internal_buffer->append('\n');
+                    buffersize += colsize + 1;
+                    newcursor->next();
+                    if (newcursor->getEOF()) 
+                        break;
+                }
+            }
+            deleteCursor(newcursor->GetID());
+            *bufsize = buffersize+1;
+            m_internal_buffer->append('\0');
+        }
+        return;
+    }
+    memcpy((void *) buffer, m_internal_buffer->ptr(), m_internal_buffer->length());
+    delete m_internal_buffer;
+    m_internal_buffer = nullptr;
 }
 
 void DBConnection_POSTGRESQL::transBegin()
diff --git a/tests/_testlib.livecodescript b/tests/_testlib.livecodescript
@@ -272,13 +272,21 @@ on TestAssertDoesNotThrow pDescription, pHandler, pTarget, pParam
   TestAssert pDescription, tError is empty 
 end TestAssertDoesNotThrow
 
+local sError
 on ErrorDialog pError
-   TestAssert "test runs without error - " && line 1 of pError \
-      , false
-   TestDiagnostic pError
-   quit 1
+	put pError into sError
 end ErrorDialog
 
+on TestAssertErrorDialog pDescription, pErrorCode
+	wait for messages
+	TestAssert pDescription, __TestErrorMatches(sError, pErrorCode)
+	put empty into sError
+end TestAssertErrorDialog
+
+function TestGetUncaughtErrorDialog
+	return sError
+end TestGetUncaughtErrorDialog
+
 function TestGetEngineRepositoryPath
   set the itemdelimiter to "/"
   return item 1 to -3 of the filename of me
diff --git a/tests/_testrunnerbehavior.livecodescript b/tests/_testrunnerbehavior.livecodescript
@@ -207,6 +207,13 @@ command TestRunnerInvokeTestCommand pScriptFile, pCommand
       TestAssert "tear down test", false
       TestDiagnostic tError  
    end try
+   
+      -- Check for uncaught errors
+   put TestGetUncaughtErrorDialog() into tError
+   if tError is not empty then
+      TestAssert "uncaught error dialog", line 1 of tError
+      TestDiagnostic tError
+   end if
 end TestRunnerInvokeTestCommand
 
 ----------------------------------------------------------------
diff --git a/tests/lcs/core/database/db_getters.livecodescript b/tests/lcs/core/database/db_getters.livecodescript
diff --git a/tests/lcs/core/engine/_extension.lcb b/tests/lcs/core/engine/_extension.lcb
diff --git a/tests/lcs/core/engine/_widgetthrow.lcb b/tests/lcs/core/engine/_widgetthrow.lcb
diff --git a/tests/lcs/core/engine/extension.livecodescript b/tests/lcs/core/engine/extension.livecodescript
diff --git a/tests/lcs/core/engine/widget.livecodescript b/tests/lcs/core/engine/widget.livecodescript
diff --git a/tests/lcs/core/interface/image-undo.livecodescript b/tests/lcs/core/interface/image-undo.livecodescript
diff --git a/tests/lcs/core/strings/matchtext.livecodescript b/tests/lcs/core/strings/matchtext.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fixed bug preventing correct rendering of ovals when creating them`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fixed bug preventing all table names being retrieved in MySQL db's`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fixed bug that overrides previous matches in matchText`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when deleting an object when a socket has a reference to a deleted object`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when checking a watched variable on a deleted object`
Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,9 @@ void MCButton::removelink(MCObject *optr)`
`395`	`395`	`{`
`396`	`396`	`if (menu.IsBound() && optr == menu)`
`397`	`397`	`{`
	`398`	`+ if (this == MCmenuobjectptr)`
	`399`	`+ MCmenuobjectptr = nil;`
	`400`	`+`
`398`	`401`	`MCValueAssign(menuname, kMCEmptyName);`
`399`	`402`	`menu = nil;`
`400`	`403`	`}`