[CI 16822] engine: deploy: Do nothing in add_version_info_entry if no context specified.

runrevmark · runrevmark · commit d0b2ccefb5a0 · 2015-01-27T11:23:14.000Z
diff --git a/engine/src/deploy_windows.cpp b/engine/src/deploy_windows.cpp
@@ -1092,6 +1092,10 @@ static uint64_t MCWindowsVersionInfoParseVersion(MCStringRef p_string)
 
 static bool add_version_info_entry(void *p_context, MCArrayRef p_array, MCNameRef p_key, MCValueRef p_value)
 {
+    // If there is no context, then we have nothing to add the entry to.
+    if (p_context == nil)
+        return true;
+    
     MCWindowsVersionInfo *t_string;
     MCExecContext ctxt(nil, nil, nil);
 	MCAutoStringRef t_value;
@@ -1111,7 +1115,8 @@ static bool add_version_info_entry(void *p_context, MCArrayRef p_array, MCNameRe
 		t_bytes[t_byte_count - 2] = '\0';
 		t_bytes[t_byte_count - 1] = '\0';	 
 	}
-	return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCNameGetCString(p_key), true, t_bytes, t_byte_count, t_string);
+	
+    return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCNameGetCString(p_key), true, t_bytes, t_byte_count, t_string);
 }
 
 static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRef p_info)

Original file line number	Diff line number	Diff line change
`@@ -1092,6 +1092,10 @@ static uint64_t MCWindowsVersionInfoParseVersion(MCStringRef p_string)`
`1092`	`1092`
`1093`	`1093`	`static bool add_version_info_entry(void *p_context, MCArrayRef p_array, MCNameRef p_key, MCValueRef p_value)`
`1094`	`1094`	`{`
	`1095`	`+ // If there is no context, then we have nothing to add the entry to.`
	`1096`	`+ if (p_context == nil)`
	`1097`	`+ return true;`
	`1098`	`+`
`1095`	`1099`	`MCWindowsVersionInfo *t_string;`
`1096`	`1100`	`MCExecContext ctxt(nil, nil, nil);`
`1097`	`1101`	`MCAutoStringRef t_value;`
`@@ -1111,7 +1115,8 @@ static bool add_version_info_entry(void *p_context, MCArrayRef p_array, MCNameRe`
`1111`	`1115`	`t_bytes[t_byte_count - 2] = '\0';`
`1112`	`1116`	`t_bytes[t_byte_count - 1] = '\0';`
`1113`	`1117`	`}`
`1114`		`- return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCNameGetCString(p_key), true, t_bytes, t_byte_count, t_string);`
	`1118`	`+`
	`1119`	`+ return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCNameGetCString(p_key), true, t_bytes, t_byte_count, t_string);`
`1115`	`1120`	`}`
`1116`	`1121`
`1117`	`1122`	`static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRef p_info)`