Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0-15.05.2019

livecodepanos · livecodepanos · commit 9142ab390c48 · 2019-05-15T14:54:51.000+03:00
diff --git a/docs/lcb/notes/22063.md b/docs/lcb/notes/22063.md
@@ -0,0 +1 @@
+# [22063] Ensure nothing can be passed to an optional foreign handler type parameter
diff --git a/docs/notes/bugfix-20027.md b/docs/notes/bugfix-20027.md
@@ -0,0 +1 @@
+# Fix value assignment to undeclared variable in matchText
diff --git a/docs/notes/bugfix-21941.md b/docs/notes/bugfix-21941.md
@@ -0,0 +1 @@
+# Fix local-ref overflow when repeatedly calling Java from LCB on older Android OSes
diff --git a/engine/src/variable.cpp b/engine/src/variable.cpp
@@ -1104,7 +1104,8 @@ bool MCContainer::remove(MCExecContext& ctxt)
 
 bool MCContainer::set_valueref(MCValueRef p_value)
 {
-	return m_variable -> setvalueref(getpath(), false, p_value);
+    m_variable -> clearuql();
+    return m_variable -> setvalueref(getpath(), false, p_value);
 }
 
 MCValueRef MCContainer::get_valueref()
diff --git a/libfoundation/src/foundation-java-private.cpp b/libfoundation/src/foundation-java-private.cpp
diff --git a/libscript/src/script-execute.cpp b/libscript/src/script-execute.cpp
@@ -1224,7 +1224,8 @@ MCScriptExecuteContext::UnboxingConvert(MCValueRef p_value,
         }
 	}
 	else if (MCTypeInfoIsHandler(p_slot_type.type) &&
-			 MCHandlerTypeInfoIsForeign(p_slot_type.type))
+			 MCHandlerTypeInfoIsForeign(p_slot_type.type) &&
+             p_value != kMCNull)
 	{
 		// If the slot type is a foreign handler, then we fetch a closure
 		// from the handler value.
diff --git a/tests/lcb/vm/native-callback.lcb b/tests/lcb/vm/native-callback.lcb
@@ -58,6 +58,23 @@ public handler TestNativeCallback()
 	test "use function pointer" when sTotal is (1 + 2 + 3 + 4 + 5 + 6)
 end handler
 
+--------- NULLPTR FUNCTION PTRS
+
+foreign handler type DummyHandlerType() returns nothing
+
+/* To test whether nothing can be passed as an optional handler type value we
+ * need any function which takes a pointer, but will ignore it. */
+foreign handler MCDataCreateWithBytes(in pPointer as optional DummyHandlerType, in pLength as LCUIndex, out rData as Data) returns CBool binds to "<builtin>"
+
+public handler TestNullptrNativeCallback()
+	variable tDummyHandler as optional DummyHandlerType
+	variable tDummyData as optional Data
+	unsafe
+		MCDataCreateWithBytes(tDummyHandler, 0, tDummyData)
+	end unsafe
+	test "use nothing as optional function pointer" when tDummyData is not nothing
+end handler
+
 --------- FOREIGN HANDLER FUNCTION PTRS
 
 -- This test checks that it is possible to pass foreign handlers around as
diff --git a/tests/lcs/core/execution/uql.livecodescript b/tests/lcs/core/execution/uql.livecodescript
@@ -0,0 +1,50 @@
+﻿script "CoreExecutionUQL"
+/*
+Copyright (C) 2018 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+on TestUQLPut
+	put "foo" into tTest1
+	TestAssert "unquoted literal put into", tTest1 is "foo"
+	put "foo" after tTest2
+	TestAssert "unquoted literal put after", tTest2 is "foo"
+	put "foo" before tTest3
+	TestAssert "unquoted literal put before", tTest3 is "foo"
+end TestUQLPut
+
+on TestUQLValue
+	TestAssert "unquoted literal value", tTest1 is "tTest1"	
+end TestUQLValue
+
+on TestUQLMatchText
+	put "rangeInt={0,3}" into tVar
+	get matchText(tVar,"(.*?)={(.*?)}", tOption, tValue)
+	TestAssert "matchText assigns correct values to UQL", \
+			tOption is "rangeInt" and tValue is "0,3"
+end TestUQLMatchText
+
+on TestUQLBinaryDecode
+	get binaryDecode("h*",sha1Digest("foobar"), tFoobar)
+	TestAssert "binaryDecode assigns correct values to UQL", \
+			tFoobar is "88347d9f426112d19ebe9b36ffc42e1852398287"
+end TestUQLBinaryDecode
+
+on TestUQLQueryRegistry
+	TestSkipIfNot "platform", "win32"
+	get queryRegistry("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ProgramFilesDir", tType)
+	TestAssert "queryRegistry assigns correct values to UQL", \
+			tType is "string"
+end TestUQLQueryRegistry

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [22063] Ensure nothing can be passed to an optional foreign handler type parameter`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix value assignment to undeclared variable in matchText`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix local-ref overflow when repeatedly calling Java from LCB on older Android OSes`
Original file line number	Diff line number	Diff line change
`@@ -1104,7 +1104,8 @@ bool MCContainer::remove(MCExecContext& ctxt)`
`1104`	`1104`
`1105`	`1105`	`bool MCContainer::set_valueref(MCValueRef p_value)`
`1106`	`1106`	`{`
`1107`		`- return m_variable -> setvalueref(getpath(), false, p_value);`
	`1107`	`+ m_variable -> clearuql();`
	`1108`	`+ return m_variable -> setvalueref(getpath(), false, p_value);`
`1108`	`1109`	`}`
`1109`	`1110`
`1110`	`1111`	`MCValueRef MCContainer::get_valueref()`
Original file line number	Diff line number	Diff line change
`@@ -1224,7 +1224,8 @@ MCScriptExecuteContext::UnboxingConvert(MCValueRef p_value,`
`1224`	`1224`	`}`
`1225`	`1225`	`}`
`1226`	`1226`	`else if (MCTypeInfoIsHandler(p_slot_type.type) &&`
`1227`		`- MCHandlerTypeInfoIsForeign(p_slot_type.type))`
	`1227`	`+ MCHandlerTypeInfoIsForeign(p_slot_type.type) &&`
	`1228`	`+ p_value != kMCNull)`
`1228`	`1229`	`{`
`1229`	`1230`	`// If the slot type is a foreign handler, then we fetch a closure`
`1230`	`1231`	`// from the handler value.`