Close fd leak in opendir / O_DIRECTORY (#16463)

tiran · web-flow · commit 5c4bcd11204d · 2022-03-10T16:09:38.000-08:00
nfd must be closed when open() O_DIRECTORY fails with ENOTDIR. Fixes: #16452 Signed-off-by: Christian Heimes <christian@python.org>
diff --git a/src/library_noderawfs.js b/src/library_noderawfs.js
@@ -90,6 +90,7 @@ mergeInto(LibraryManager.library, {
       var nfd = fs.openSync(pathTruncated, NODEFS.flagsForNode(flags), mode);
       var st = fs.fstatSync(nfd);
       if (flags & {{{ cDefine('O_DIRECTORY') }}} && !st.isDirectory()) {
+        fs.closeSync(nfd);
         throw new FS.ErrnoError(ERRNO_CODES.ENOTDIR);
       }
       var newMode = NODEFS.getMode(pathTruncated);

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ mergeInto(LibraryManager.library, {`
`90`	`90`	`var nfd = fs.openSync(pathTruncated, NODEFS.flagsForNode(flags), mode);`
`91`	`91`	`var st = fs.fstatSync(nfd);`
`92`	`92`	`if (flags & {{{ cDefine('O_DIRECTORY') }}} && !st.isDirectory()) {`
	`93`	`+ fs.closeSync(nfd);`
`93`	`94`	`throw new FS.ErrnoError(ERRNO_CODES.ENOTDIR);`
`94`	`95`	`}`
`95`	`96`	`var newMode = NODEFS.getMode(pathTruncated);`