From ef39c11940a830fc876cf63ce9fdc521647d7239 Mon Sep 17 00:00:00 2001 From: dajiaohuang Date: Thu, 22 Oct 2026 21:09:29 +0800 Subject: [PATCH] Read compiled template streams exactly --- RazorEngineCore.Tests/TestSaveLoad.cs | 41 +++++++++++++++++++ RazorEngineCore/ObjectExtenders.cs | 23 +++++++++-- .../RazorEngineCompiledTemplateMeta.cs | 6 +-- 3 files changed, 61 insertions(+), 9 deletions(-) diff --git a/RazorEngineCore.Tests/TestSaveLoad.cs b/RazorEngineCore.Tests/TestSaveLoad.cs index 10a6dde..a9c8bd8 100644 --- a/RazorEngineCore.Tests/TestSaveLoad.cs +++ b/RazorEngineCore.Tests/TestSaveLoad.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Threading; using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using RazorEngineCore.Tests.Models; @@ -156,5 +157,45 @@ public async Task TestSave_RazorEngineCompiledTemplateMeta_2() Assert.AreEqual(meta1.GeneratedSourceCode, meta2.GeneratedSourceCode); Assert.AreEqual(meta1.TemplateSource, meta2.TemplateSource); } + + [TestMethod] + public async Task TestLoadFromStream_HandlesPartialReads() + { + RazorEngine razorEngine = new RazorEngine(); + IRazorEngineCompiledTemplate initialTemplate = razorEngine.Compile("Hello @Model.Name"); + + using (MemoryStream serializedTemplate = new MemoryStream()) + { + await initialTemplate.SaveToStreamAsync(serializedTemplate); + + using (SingleByteReadStream partialReadStream = new SingleByteReadStream(serializedTemplate.ToArray())) + { + IRazorEngineCompiledTemplate loadedTemplate = await RazorEngineCompiledTemplate.LoadFromStreamAsync(partialReadStream); + string result = await loadedTemplate.RunAsync(new { Name = "Alex" }); + + Assert.AreEqual("Hello Alex", result); + Assert.AreEqual(serializedTemplate.Length, partialReadStream.Position); + } + } + } + + private sealed class SingleByteReadStream : MemoryStream + { + public SingleByteReadStream(byte[] buffer) : base(buffer) + { + } + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + return base.ReadAsync(buffer, offset, Math.Min(1, count), cancellationToken); + } + +#if !NETFRAMEWORK + public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) + { + return base.ReadAsync(buffer.Slice(0, Math.Min(1, buffer.Length)), cancellationToken); + } +#endif + } } } \ No newline at end of file diff --git a/RazorEngineCore/ObjectExtenders.cs b/RazorEngineCore/ObjectExtenders.cs index 857bf1c..3362d39 100644 --- a/RazorEngineCore/ObjectExtenders.cs +++ b/RazorEngineCore/ObjectExtenders.cs @@ -33,14 +33,29 @@ public static bool IsAnonymous(this object obj) && type.Attributes.HasFlag(TypeAttributes.NotPublic); } - public static async Task ReadLong(this Stream stream) + internal static async Task ReadExactlyAsync(this Stream stream, byte[] buffer) { - byte[] buffer = new byte[8]; + int offset = 0; + while (offset < buffer.Length) + { #if NETSTANDARD2_0 - _ = await stream.ReadAsync(buffer, 0, buffer.Length); + int bytesRead = await stream.ReadAsync(buffer, offset, buffer.Length - offset); #else - _ = await stream.ReadAsync(buffer.AsMemory(0, buffer.Length)); + int bytesRead = await stream.ReadAsync(buffer.AsMemory(offset, buffer.Length - offset)); #endif + if (bytesRead == 0) + { + throw new EndOfStreamException(); + } + + offset += bytesRead; + } + } + + public static async Task ReadLong(this Stream stream) + { + byte[] buffer = new byte[8]; + await stream.ReadExactlyAsync(buffer); return BitConverter.ToInt64(buffer, 0); } diff --git a/RazorEngineCore/RazorEngineCompiledTemplateMeta.cs b/RazorEngineCore/RazorEngineCompiledTemplateMeta.cs index b72a525..f18ef67 100644 --- a/RazorEngineCore/RazorEngineCompiledTemplateMeta.cs +++ b/RazorEngineCore/RazorEngineCompiledTemplateMeta.cs @@ -88,11 +88,7 @@ private static async Task ReadBuffer(Stream stream) } byte[] buffer = new byte[length]; -#if NETSTANDARD2_0 - _ = await stream.ReadAsync(buffer, 0, buffer.Length); -#else - _ = await stream.ReadAsync(buffer); -#endif + await stream.ReadExactlyAsync(buffer); return buffer; } }