Merge pull request livecode#1502 from runrevsebastien/bugfix-14052

livecodesebastien · livecodesebastien · commit 5f2eed6da59c · 2014-12-02T13:41:16.000Z
[[ Bug 14052 ]] Ensure no nil string is returned for the type in queryRe...
diff --git a/docs/notes/bugfix-14052.md b/docs/notes/bugfix-14052.md
@@ -0,0 +1 @@
+# LiveCode 7 crashes without error in many commands
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -382,6 +382,8 @@ bool MCS_registry_type_to_string(uint32_t p_type, MCStringRef& r_string)
 		}
 	}
 
+    // SN-2014-11-18: [[ Bug 14052 ]] Avoid to return a nil string (the result is not checked anyway).
+    r_string = MCValueRetain(kMCEmptyString);
 	return false;
 }
 
diff --git a/engine/src/exec-files.cpp b/engine/src/exec-files.cpp
@@ -455,6 +455,8 @@ void MCFilesEvalQueryRegistryWithType(MCExecContext& ctxt, MCStringRef p_key, MC
 		{
 			ctxt.SetTheResultToValue(*t_error);
 			r_string = MCValueRetain(kMCEmptyString);
+            // SN-2014-11-18: [[ Bug 14052 ]] Assign the empty string to the type as well.
+            r_type = MCValueRetain(kMCEmptyString);
 		}
 		else
 			ctxt.SetTheResultToEmpty();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# LiveCode 7 crashes without error in many commands`
Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,8 @@ bool MCS_registry_type_to_string(uint32_t p_type, MCStringRef& r_string)`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
	`385`	`+ // SN-2014-11-18: [[ Bug 14052 ]] Avoid to return a nil string (the result is not checked anyway).`
	`386`	`+ r_string = MCValueRetain(kMCEmptyString);`
`385`	`387`	`return false;`
`386`	`388`	`}`
`387`	`389`
Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,8 @@ void MCFilesEvalQueryRegistryWithType(MCExecContext& ctxt, MCStringRef p_key, MC`
`455`	`455`	`{`
`456`	`456`	`ctxt.SetTheResultToValue(*t_error);`
`457`	`457`	`r_string = MCValueRetain(kMCEmptyString);`
	`458`	`+ // SN-2014-11-18: [[ Bug 14052 ]] Assign the empty string to the type as well.`
	`459`	`+ r_type = MCValueRetain(kMCEmptyString);`
`458`	`460`	`}`
`459`	`461`	`else`
`460`	`462`	`ctxt.SetTheResultToEmpty();`