Fixed NullReference on closed stream

Flexberry · Apr 18, 2023 · 0486e30 · 0486e30
1 parent 029aa1e
commit 0486e30
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/NewPlatform.Flexberry.ORM.ODataService/Extensions/ODataApplicationBuilderExtensions.cs b/NewPlatform.Flexberry.ORM.ODataService/Extensions/ODataApplicationBuilderExtensions.cs
@@ -78,8 +78,7 @@ public static async Task RewriteResponse(HttpContext context, Func<Task> next)
                     await next();
 
                     responseBodyStream.Seek(0, SeekOrigin.Begin);
-                    using StreamReader sr = new StreamReader(responseBodyStream);
-                    var responseBody = sr.ReadToEnd();
+                    var responseBody = new StreamReader(responseBodyStream).ReadToEnd();
 
                     //Modify the response in some way.
                     if (context.Response.ContentType != null &&

diff --git a/NewPlatform.Flexberry.ORM.ODataService/Handlers/PostPatchHandler.cs b/NewPlatform.Flexberry.ORM.ODataService/Handlers/PostPatchHandler.cs
@@ -96,26 +96,27 @@ private static async Task RewriteResponse(HttpResponseMessage response)
             {
                 HttpContent content = response.Content;
                 Stream contentStream = await content.ReadAsStreamAsync();
-                using StreamReader sr = new StreamReader(contentStream);
-                string responseStr = sr.ReadToEnd();
-
-                responseStr = responseStr
+                string responseStr = new StreamReader(contentStream).ReadToEnd();
+                if (!string.IsNullOrEmpty(responseStr) && responseStr.Length > 3)
+                {
+                    responseStr = responseStr
                    .Replace("(____.", "(")
                    .Replace("\"____.", "\"")
                    .Replace("____.", ".")
                    .Replace(" Namespace=\"____\"", " Namespace=\"\"");
 
-                using (MemoryStream newStream = new MemoryStream())
-                {
-                    using StreamWriter sw = new StreamWriter(newStream);
-                    sw.Write(responseStr);
-                    sw.Flush();
-                    newStream.Seek(0, SeekOrigin.Begin);
+                    using (MemoryStream newStream = new MemoryStream())
+                    {
+                        using StreamWriter sw = new StreamWriter(newStream);
+                        sw.Write(responseStr);
+                        sw.Flush();
+                        newStream.Seek(0, SeekOrigin.Begin);
 
-                    contentStream.Position = 0;
-                    contentStream.SetLength(0);
+                        contentStream.Position = 0;
+                        contentStream.SetLength(responseStr.Length);
 
-                    await newStream.CopyToAsync(contentStream);
+                        await newStream.CopyToAsync(contentStream);
+                    }
                 }
             }
         }