[Aaru.Console] Markup more console output to prevent Spectre from cra…

…shing.
aaru-dps · Oct 26, 2023 · da3bbdc · da3bbdc
1 parent 520eb54
commit da3bbdc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/Aaru/Commands/Archive/Extract.cs b/Aaru/Commands/Archive/Extract.cs
@@ -266,6 +266,13 @@ public static int Invoke(bool   debug, bool verbose, string encoding, bool xattr
 
                 string outputPath     = Path.Combine(outputDir, fileName);
                 string destinationDir = Path.GetDirectoryName(outputPath);
+
+                if(File.Exists(destinationDir))
+                {
+                    AaruConsole.ErrorWriteLine(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
+                    continue;
+                }
+
                 if(destinationDir is not null)
                     Directory.CreateDirectory(destinationDir);
 
@@ -450,7 +457,7 @@ public static int Invoke(bool   debug, bool verbose, string encoding, bool xattr
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
             AaruConsole.WriteException(ex);
 
             return (int)ErrorNumber.UnexpectedException;

diff --git a/Aaru/Commands/Archive/Info.cs b/Aaru/Commands/Archive/Info.cs
@@ -184,7 +184,7 @@ public static int Invoke(bool debug, bool verbose, string archivePath, string en
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
             AaruConsole.WriteException(ex);
 
             return (int)ErrorNumber.UnexpectedException;

diff --git a/Aaru/Commands/Archive/List.cs b/Aaru/Commands/Archive/List.cs
@@ -392,7 +392,7 @@ public static int Invoke(bool debug, bool verbose, string encoding, string archi
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
             AaruConsole.WriteException(ex);
 
             return (int)ErrorNumber.UnexpectedException;

diff --git a/Aaru/Commands/Filesystem/ExtractFiles.cs b/Aaru/Commands/Filesystem/ExtractFiles.cs
@@ -386,7 +386,7 @@ public static int Invoke(bool   debug,      bool   verbose,   string encoding, b
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
             AaruConsole.WriteException(ex);
 
             return (int)ErrorNumber.UnexpectedException;

diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs
@@ -349,7 +349,7 @@ public static int Invoke(bool   debug,      bool   verbose, string encoding, str
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
             AaruConsole.WriteException(ex);
 
             return (int)ErrorNumber.UnexpectedException;

diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs
@@ -298,7 +298,7 @@ public static int Invoke(bool   debug,     bool verbose, uint blockSize, [CanBeN
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+                AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
                 AaruConsole.WriteException(ex);
 
                 return (int)ErrorNumber.UnexpectedException;

diff --git a/Aaru/Commands/Image/Info.cs b/Aaru/Commands/Image/Info.cs
@@ -168,7 +168,7 @@ public static int Invoke(bool debug, bool verbose, string imagePath)
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
             AaruConsole.WriteException(ex);
 
             return (int)ErrorNumber.UnexpectedException;

diff --git a/build.sh b/build.sh