Merge remote-tracking branch 'upstream/patch-api' into develop

interpreter.cpp

@@ -125,7 +125,7 @@ void interpreter::unregister_group(group *pgroup) {
 	pgroup->ref_handle = 0;
 }
 int32 interpreter::load_script(const char* script_name) {
-	int32 len = 0;
+	int len = 0;
 	byte* buffer = ::read_script(script_name, &len);
 	if (!buffer)
 		return OPERATION_FAIL;

ocgapi.cpp

@@ -44,12 +44,12 @@ byte* default_script_reader(const char* script_name, int* slen) {
 	FILE *fp;
 	fp = std::fopen(script_name, "rb");
 	if (!fp)
-		return 0;
-	int len = (int)fread(buffer, 1, sizeof(buffer), fp);
+		return nullptr;
+	size_t len = std::fread(buffer, 1, sizeof buffer, fp);
 	std::fclose(fp);
-	if(len >= sizeof(buffer))
-		return 0;
-	*slen = len;
+	if (len >= sizeof buffer)
+		return nullptr;
+	*slen = (int)len;
 	return buffer;
 }
 uint32 default_card_reader(uint32 code, card_data* data) {