Commit319c003

committed

Limit V3 compund files to 2 GB

1 parentf856dc9 commit319c003Copy full SHA for 319c003

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`<PrivateAssets>all</PrivateAssets>`
`21`	`21`	`<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>`
`22`	`22`	`</PackageReference>`
	`23`	`+ <PackageReferenceInclude="Microsoft.IO.RecyclableMemoryStream" />`
`23`	`24`	`<PackageReferenceInclude="Microsoft.NET.Test.Sdk" />`
`24`	`25`	`<PackageReferenceInclude="MSTest" />`
`25`	`26`	`</ItemGroup>`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespaceOpenMcdf.Tests;`
	`1`	`+usingMicrosoft.IO;`
	`2`	`+`
	`3`	`+namespaceOpenMcdf.Tests;`
`2`	`4`
`3`	`5`	`[TestClass]`
`4`	`6`	`publicsealedclassRootStorageTests`
`@@ -231,4 +233,23 @@ public void DeleteTrimsBaseStream(bool consolidate)`
`231`	`233`
`232`	`234`	`Assert.IsTrue(originalLength>newLength);`
`233`	`235`	`}`
	`236`	`+`
	`237`	`+[TestMethod]`
	`238`	`+[DoNotParallelize]// High memory usage`
	`239`	`+publicvoidV3ThrowsIOExceptionAt2GB()`
	`240`	`+{`
	`241`	`+constlongMaxStreamLength=2L10241024*1024;`
	`242`	`+`
	`243`	`+RecyclableMemoryStreamManagermanager=new();`
	`244`	`+usingRecyclableMemoryStreambaseStream=new(manager);`
	`245`	`+baseStream.Capacity64=MaxStreamLength;`
	`246`	`+`
	`247`	`+usingvarrootStorage=RootStorage.Create(baseStream,Version.V3);`
	`248`	`+usingCfbStreamstream=rootStorage.CreateStream("Test");`
	`249`	`+byte[]buffer=TestData.CreateByteArray(1024*1024);`
	`250`	`+while(baseStream.Length+buffer.Length<=MaxStreamLength)`
	`251`	`+stream.Write(buffer,0,buffer.Length);`
	`252`	`+`
	`253`	`+Assert.ThrowsException<IOException>(()=>stream.Write(buffer,0,buffer.Length));`
	`254`	`+}`
`234`	`255`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ enum IOContextFlags`
`16`	`16`	`/// </summary>`
`17`	`17`	`internalsealedclassRootContext:ContextBase,IDisposable`
`18`	`18`	`{`
	`19`	`+constlongMaximumV3StreamLength=2147483648;`
	`20`	`+`
`19`	`21`	`readonlyIOContextFlagscontextFlags;`
`20`	`22`	`readonlyCfbBinaryWriter?writer;`
`21`	`23`	`readonlyTransactedStream?transactedStream;`
`@@ -185,6 +187,9 @@ public void Flush()`
`185`	`187`
`186`	`188`	`publicvoidExtendStreamLength(longlength)`
`187`	`189`	`{`
	`190`	`+if(VersionisVersion.V3&&length>MaximumV3StreamLength)`
	`191`	`+thrownewIOException("V3 compound files are limited to 2 GB.");`
	`192`	`+`
`188`	`193`	`if(Length<length)`
`189`	`194`	`Length=length;`
`190`	`195`	`}`

Comments

(0)