Commit83f887b

authored

Merge pull request#1210 from streamich/copilot/fix-2b466ca6-c20f-4dd5-ba6c-f247873f1bc2

fix: handle stream reading past file size in FsaNodeReadStream

2 parentsaba1279 +2eac49b commit83f887bCopy full SHA for 83f887b

File tree

+29

-0

lines changed

+29

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export class FsaNodeReadStream extends Readable implements IReadStream {`
`44`	`44`	`conststart=this.options.start\|\|0;`
`45`	`45`	`letend=typeofthis.options.end==='number' ?this.options.end+1 :buffer.byteLength;`
`46`	`46`	`if(end>buffer.byteLength)end=buffer.byteLength;`
	`47`	`+if(start>=buffer.byteLength)returnnewUint8Array(0);`
`47`	`48`	`constuint8=newUint8Array(buffer,start,end-start);`
`48`	`49`	`returnuint8;`
`49`	`50`	`});`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -990,5 +990,33 @@ onlyOnNode20('FsaNodeFs', () => {`
`990`	`990`	`'/mountpoint/f.html':'test',`
`991`	`991`	`});`
`992`	`992`	`});`
	`993`	`+`
	`994`	`+test('can read with start position beyond file size',async()=>{`
	`995`	`+const{ fs, vol}=setup({folder:{file:'test'},'empty-folder':null,'f.html':'test'});`
	`996`	`+constreadStream=fs.createReadStream('/folder/file',{start:100});`
	`997`	`+constwriteStream=fs.createWriteStream('/folder/file2');`
	`998`	`+readStream.pipe(writeStream);`
	`999`	`+awaitnewPromise(resolve=>writeStream.once('close',resolve));`
	`1000`	`+expect(vol.toJSON()).toStrictEqual({`
	`1001`	`+'/mountpoint/folder/file':'test',`
	`1002`	`+'/mountpoint/folder/file2':'',`
	`1003`	`+'/mountpoint/empty-folder':null,`
	`1004`	`+'/mountpoint/f.html':'test',`
	`1005`	`+});`
	`1006`	`+});`
	`1007`	`+`
	`1008`	`+test('can read with start position at file size',async()=>{`
	`1009`	`+const{ fs, vol}=setup({folder:{file:'test'},'empty-folder':null,'f.html':'test'});`
	`1010`	`+constreadStream=fs.createReadStream('/folder/file',{start:4});`
	`1011`	`+constwriteStream=fs.createWriteStream('/folder/file3');`
	`1012`	`+readStream.pipe(writeStream);`
	`1013`	`+awaitnewPromise(resolve=>writeStream.once('close',resolve));`
	`1014`	`+expect(vol.toJSON()).toStrictEqual({`
	`1015`	`+'/mountpoint/folder/file':'test',`
	`1016`	`+'/mountpoint/folder/file3':'',`
	`1017`	`+'/mountpoint/empty-folder':null,`
	`1018`	`+'/mountpoint/f.html':'test',`
	`1019`	`+});`
	`1020`	`+});`
`993`	`1021`	`});`
`994`	`1022`	`});`

Comments

(0)