Fix a potential memory leak in the VxWorks VFS that can occur following

an OOM or I/O error during xOpen().

FossilOrigin-Name: cb880145d899832cca0612b89024a54d188ed706600fa812ea74587d69c261be

diff --git a/manifest b/manifest
index fc0ad4218435c1eebbf5153dbf798fdeb6ef5b57..5dffbf67c0bd46edc095b9203d56f0b892e51109 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sVxWorks,\stemporary\sfilenames\smust\sbe\sfull\sabsolute\spathnames\sin\sorder\sfor\nvxworksFindFileId()\sto\swork.
-D 2025-09-08T18:45:58.689
+C Fix\sa\spotential\smemory\sleak\sin\sthe\sVxWorks\sVFS\sthat\scan\soccur\sfollowing\nan\sOOM\sor\sI/O\serror\sduring\sxOpen().
+D 2025-09-08T19:56:14.451
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -726,7 +726,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
-F src/os_unix.c cac4239af53a2db3cd3d53dcad66c733741160b0c2f4695529b5837f611f1140
+F src/os_unix.c c775163235cbb059653911fb7aece04556c8be4683a1877e212e60b5b8daa7dc
 F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
 F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 F src/pager.c ee48e0cc9ae4abfd7c37b838bff62a14d520a9fa311007fa57929ac7cc5d609c
@@ -2174,8 +2174,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c87e68d791215729fb513c651e77c6ef6bb260deff37ed2ab6e99b777271bdfe
-R 80e9f402d7a8c193e31c20e8dc8a9c4d
+P 1fc94becc5971812c3a91fb1410cb54f6ecb9e50da2d30863dc840cbf4e6c1f5
+R f2c71ab27bcd4917cc1551d07ff94fab
 U drh
-Z 7bd1420ecf42bd36a5fe0dd1d8cae4bf
+Z cd23f29e7ac5df50fa7933e5c9aed5ef
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index daf656800a0047c5616733cf8ddf0a6697b1ca7e..31aae175d1e043cc386210e99aa827dd0997fdaa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fc94becc5971812c3a91fb1410cb54f6ecb9e50da2d30863dc840cbf4e6c1f5
+cb880145d899832cca0612b89024a54d188ed706600fa812ea74587d69c261be

diff --git a/src/os_unix.c b/src/os_unix.c
index 12cb61eb586904ab3b156a9d0948dc349f6e9f3f..459a0ffd8048a8c9772875091bb7c3563bacf5e2 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5982,10 +5982,16 @@ static int fillInUnixFile(
   storeLastErrno(pNew, 0);
 #if OS_VXWORKS
   if( rc!=SQLITE_OK ){
-    if( h>=0 ) robust_close(pNew, h, __LINE__);
-    h = -1;
+    if( h>=0 ){
+      robust_close(pNew, h, __LINE__);
+      h = -1;
+    }
     osUnlink(zFilename);
     pNew->ctrlFlags |= UNIXFILE_DELETE;
+    if( pNew->pId ){
+      vxworksReleaseFileId(pNew->pId);
+      pNew->pId = 0;
+    }
   }
 #endif
   if( rc!=SQLITE_OK ){