Merge pull request #36 from doubleyewdee/master

Fixes for typo+int.MaxValue streams
microsoft · Dec 14, 2016 · d1ea6d1 · d1ea6d1
2 parents d1b5880 + ef151ba
commit d1ea6d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Microsoft.IO.RecyclableMemoryStream.nuspec b/Microsoft.IO.RecyclableMemoryStream.nuspec
@@ -2,8 +2,8 @@
 <package>
   <metadata>
     <id>Microsoft.IO.RecyclableMemoryStream</id>
-    <version>1.2.0</version>
-    <title>Micrisift.IO.RecyclableMemoryStream</title>
+    <version>1.2.1</version>
+    <title>Microsoft.IO.RecyclableMemoryStream</title>
     <authors>Ben Watson; Chip Locke</authors>
     <licenseUrl>https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream</projectUrl>

diff --git a/UnitTests/Tests.cs b/UnitTests/Tests.cs
@@ -444,6 +444,9 @@ public void GiantAllocationSucceeds()
                 var stream = mgr.GetStream(null, requestedSize);
                 Assert.IsTrue(stream.Capacity >= requestedSize);
             }
+
+            var maxStream = mgr.GetStream(null, int.MaxValue);
+            Assert.IsTrue(maxStream.Capacity == int.MaxValue);
         }
         #endregion
 

diff --git a/src/RecyclableMemoryStream.cs b/src/RecyclableMemoryStream.cs
@@ -314,7 +314,7 @@ public override int Capacity
                     return this.largeBuffer.Length;
                 }
 
-                long size = this.blocks.Count * this.memoryManager.BlockSize;
+                long size = (long)this.blocks.Count * this.memoryManager.BlockSize;
                 return (int)Math.Min(int.MaxValue, size);
             }
             set