Merge #2549 Fix null ref exception when repo has empty ckan file

KSP-CKAN · Oct 28, 2018 · 5b54850 · 5b54850
2 parents e3648d9 + bdc2f76
commit 5b54850
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file.
 - [Core] Don't throw exceptions when resetting cache dir (#2547 by: HebaruSan; reviewed: politas)
 - [GUI] Fix crash at startup on Windows risen in #2536 (#2557 by: HebaruSan; reviewed: Olympic1)
 - [Core] Allow game version of "any" with a vref (#2553 by: HebaruSan; reviewed: Olympic1)
+- [Core] Fix null ref exception when repo has empty ckan file (#2549 by: HebaruSan; reviewed: Olympic1)
 
 ## v1.25.3 (Woomera)
 

diff --git a/Core/Net/Repo.cs b/Core/Net/Repo.cs
@@ -548,7 +548,11 @@ private static CkanModule ProcessRegistryMetadataFromJSON(string metadata, strin
             try
             {
                 CkanModule module = CkanModule.FromJson(metadata);
-                log.DebugFormat("Found {0} version {1}", module.identifier, module.version);
+                // FromJson can return null for the empty string
+                if (module != null)
+                {
+                    log.DebugFormat("Found {0} version {1}", module.identifier, module.version);
+                }
                 return module;
             }
             catch (Exception exception)