[Bug 14826] com.livecode.foreign: Error for nul in ZStringNative.

peter-b · peter-b · commit 4aa512dc71b0 · 2015-03-06T15:35:37.000Z
Throw an error when attempting to export a string containing the nul
character (U+0000) to a ZStringNative.
diff --git a/libscript/src/module-foreign.cpp b/libscript/src/module-foreign.cpp
@@ -133,6 +133,9 @@ static bool __nativecstring_import(void *contents, bool release, MCValueRef& r_v
 
 static bool __nativecstring_export(MCValueRef value, bool release, void *contents)
 {
+	if (!MCForeignEvalStringNonNull ((MCStringRef) value))
+		return false;
+
     char *t_cstring_value;
     if (!MCStringConvertToCString((MCStringRef)value, t_cstring_value))
         return false;
diff --git a/tests/lcb/stdlib/foreign.lcb b/tests/lcb/stdlib/foreign.lcb
@@ -20,6 +20,17 @@ module com.livecode.foreign.tests
 use com.livecode.foreign
 use com.livecode.__INTERNAL._testlib
 
+handler TestZStringNative_Null()
+	variable t as ZStringNative
+	put "\u{0}" into t
+end handler
+public handler TestZStringNative()
+	-- bug 14826
+	-- Check that strings containing embedded nuls can't be
+	-- bridged.
+	MCUnitTestHandlerThrows(TestZStringNative_Null, "ZStringNative (nulls")
+end handler
+
 handler TestZStringUTF16_Null()
 	variable t as ZStringUTF16
 	put "\u{0}" into t

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@ static bool __nativecstring_import(void *contents, bool release, MCValueRef& r_v`
`133`	`133`
`134`	`134`	`static bool __nativecstring_export(MCValueRef value, bool release, void *contents)`
`135`	`135`	`{`
	`136`	`+ if (!MCForeignEvalStringNonNull ((MCStringRef) value))`
	`137`	`+ return false;`
	`138`	`+`
`136`	`139`	`char *t_cstring_value;`
`137`	`140`	`if (!MCStringConvertToCString((MCStringRef)value, t_cstring_value))`
`138`	`141`	`return false;`