Include json::parse() in try-catch block

To avoid unhandled exception if json::parse() fails.
monocasual · Jan 27, 2024 · 97ade6c · 97ade6c
1 parent c8c8740
commit 97ade6c
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/core/patchFactory.cpp b/src/core/patchFactory.cpp
@@ -416,26 +416,26 @@ Patch deserialize(const std::string& filePath)
 		return patch;
 	}
 
-	nlohmann::json j = nlohmann::json::parse(ifs);
-
-	if (j[PATCH_KEY_HEADER] != "GIADAPTC")
+	try
 	{
-		patch.status = G_FILE_INVALID;
-		return patch;
-	}
+		nlohmann::json j = nlohmann::json::parse(ifs);
 
-	patch.version = {
-	    static_cast<int>(j[PATCH_KEY_VERSION_MAJOR]),
-	    static_cast<int>(j[PATCH_KEY_VERSION_MINOR]),
-	    static_cast<int>(j[PATCH_KEY_VERSION_PATCH])};
-	if (patch.version < Patch::Version{0, 16, 0})
-	{
-		patch.status = G_FILE_UNSUPPORTED;
-		return patch;
-	}
+		if (j[PATCH_KEY_HEADER] != "GIADAPTC")
+		{
+			patch.status = G_FILE_INVALID;
+			return patch;
+		}
+
+		patch.version = {
+		    static_cast<int>(j[PATCH_KEY_VERSION_MAJOR]),
+		    static_cast<int>(j[PATCH_KEY_VERSION_MINOR]),
+		    static_cast<int>(j[PATCH_KEY_VERSION_PATCH])};
+		if (patch.version < Patch::Version{0, 16, 0})
+		{
+			patch.status = G_FILE_UNSUPPORTED;
+			return patch;
+		}
 
-	try
-	{
 		readCommons_(patch, j);
 		readColumns_(patch, j);
 		readPlugins_(patch, j);