Merge from PR #18 (Fix for ReleaseMemory flag in commit operations)

ironfede · Apr 14, 2018 · 6e0a17e · 6e0a17e
2 parents 1ffb4e4 + f7e88dd
commit 6e0a17e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/sources/OpenMcdf/CompoundFile.cs b/sources/OpenMcdf/CompoundFile.cs
@@ -550,7 +550,7 @@ public void Commit(bool releaseMemory)
                     gap = true;
                 }
 
-                if (releaseMemory)
+                if ( s != null && releaseMemory)
                 {
 
                     s.ReleaseData();

diff --git a/sources/Test/OpenMcdf.Test/CompoundFileTest.cs b/sources/Test/OpenMcdf.Test/CompoundFileTest.cs
@@ -978,7 +978,7 @@ public void Test_FIX_BUG_GH_15()
             compoundFile.Close();
 
             byte[] readBuffer = new byte[15];
-             compoundFile = new CompoundFile(filename);
+            compoundFile = new CompoundFile(filename);
 
             byte c = 0x0A;
             for (int i = 0; i < iterationCount; i++)
@@ -990,7 +990,23 @@ public void Test_FIX_BUG_GH_15()
             compoundFile.Close();
         }
 
-
+        [TestMethod]
+        public void Test_PR_GH_18()
+        {
+            try
+            {
+                var f = new CompoundFile("MultipleStorage4.cfs",CFSUpdateMode.Update,CFSConfiguration.Default);
+                var st = f.RootStorage.GetStorage("MyStorage").GetStorage("AnotherStorage").GetStream("MyStream");
+                st.Write(Helpers.GetBuffer(100, 0x02), 100);
+                f.Commit(true);
+                Assert.IsTrue(st.GetData().Count() == 31220);
+                f.Close();
+            }
+            catch (Exception ex)
+            {
+                Assert.Fail("Release Memory flag caused error");
+            }
+        }
         //[TestMethod]
         //public void Test_CORRUPTED_CYCLIC_DIFAT_VALIDATION_CHECK()
         //{