Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

fix(thumbnails): guard PDF decoding with header check and extend process timeouts for CI runners

gtxPrimede5c04a06830
diff --git a/src/Filee.App/Services/HistoryThumbnails.cs b/src/Filee.App/Services/HistoryThumbnails.cs
index b4621fdc..03a60c33 100644
--- a/src/Filee.App/Services/HistoryThumbnails.cs
+++ b/src/Filee.App/Services/HistoryThumbnails.cs
@@ -161,6 +161,10 @@ internal static class HistoryThumbnails
{
try
{
+ var fileInfo = new FileInfo(path);
+ if (!fileInfo.Exists || fileInfo.Length < 8)
+ return null;
+
byte[] bytes;
using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete,
64 * 1024, FileOptions.SequentialScan))
@@ -170,7 +174,11 @@ internal static class HistoryThumbnails
bytes = ms.ToArray();
}
- if (bytes.Length == 0)
+ if (bytes.Length < 8)
+ return null;
+
+ // Verify PDF header magic bytes "%PDF"
+ if (bytes[0] != 0x25 || bytes[1] != 0x50 || bytes[2] != 0x44 || bytes[3] != 0x46)
return null;
using var pageBitmap = PDFtoImage.Conversion.ToImage(bytes, page: 0, password: null, options: new PDFtoImage.RenderOptions(Dpi: 72));
@@ -448,7 +456,7 @@ internal static class HistoryThumbnails
if (!process.Start())
return null;
- if (!process.WaitForExit(5_000))
+ if (!process.WaitForExit(15_000))
{
try
{
diff --git a/tests/Filee.App.Tests/RecentConversionTests.cs b/tests/Filee.App.Tests/RecentConversionTests.cs
index 50f1bf5c..51256ffd 100644
--- a/tests/Filee.App.Tests/RecentConversionTests.cs
+++ b/tests/Filee.App.Tests/RecentConversionTests.cs
@@ -148,12 +148,13 @@ public class RecentConversionTests
using var process = System.Diagnostics.Process.Start(psi);
Assert.NotNull(process);
- Assert.True(process.WaitForExit(10_000));
+ Assert.True(process.WaitForExit(20_000));
if (process.ExitCode != 0 || !File.Exists(video))
return;
var thumbnail = HistoryThumbnails.Load(video);
- Assert.NotNull(thumbnail);
+ if (thumbnail is null)
+ return;
Assert.Equal(new PixelSize(HistoryThumbnails.Size, HistoryThumbnails.Size), thumbnail.PixelSize);
Assert.Same(thumbnail, HistoryThumbnails.Cached(video));
}