Fix verification process proceeding if the file is not a valid ELF file

LittleBigRefresh · Jan 19, 2024 · 4890512 · 4890512
1 parent 411c419
commit 4890512
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Refresher.sln.DotSettings b/Refresher.sln.DotSettings
@@ -23,6 +23,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hellscape/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=jvyden/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=LITTLEBIGPLANETPS/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=patchables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reverify/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=RFSH/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=RPCS/@EntryIndexedValue">True</s:Boolean>

diff --git a/Refresher/Patching/EbootPatcher.cs b/Refresher/Patching/EbootPatcher.cs
@@ -296,10 +296,6 @@ public List<Message> Verify(string url, bool patchDigest)
         List<Message> messages = new();
 
         this.Stream.Position = 0;
-        Class output = ELFReader.CheckELFType(this.Stream);
-        if (output == Class.NotELF)
-            messages.Add(new Message(MessageLevel.Warning, 
-                                     "File is not a valid ELF!"));
 
         // Check url
         if (url.EndsWith('/'))
@@ -309,6 +305,13 @@ public List<Message> Verify(string url, bool patchDigest)
         //Try to create an absolute URI, if it fails, its not a valid URI
         if (!Uri.TryCreate(url, UriKind.Absolute, out Uri? uri))
             messages.Add(new Message(MessageLevel.Error, "URI is not valid"));
+
+        Class output = ELFReader.CheckELFType(this.Stream);
+        if (output == Class.NotELF)
+        {
+            messages.Add(new Message(MessageLevel.Error, "File is not a valid ELF file."));
+            return messages; // Early return, since here on out we check for valid patchables.
+        }
 
         // If there are no Url or Host targets, we cant patch
         // ReSharper disable once SimplifyLinqExpressionUseAll