Take care not to invoke the xShmClose method of the VFS with a NULL

shared memory object.

FossilOrigin-Name: 1465d3842c52aa7471f63deb47fe5b256d4e01c2

diff --git a/manifest b/manifest
index c0dc916acab65904b865dc9629911de3026f6bf6..1551534cda7ec0f73a9c6fba9abac408c7dc0704 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\sa\stest\scase\sto\sverify\sthat\slog\sfiles\scontaining\spages\sthat\sare\snot\sa\spower-of-two\sbytes\sin\ssize\sare\shandled\scorrectly.
-D 2010-05-04T15:20:45
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Take\scare\snot\sto\sinvoke\sthe\sxShmClose\smethod\sof\sthe\sVFS\swith\sa\sNULL\s\nshared\smemory\sobject.
+D 2010-05-04T16:33:38
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -221,7 +224,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c 558700d2d596af389305c193fe98e79406a50982
+F src/wal.c 7f5d355cee4e3e7388f8abc1a34c131c46b693aa
 F src/wal.h b4c42014b5fa3b4e6244ac8c65de7ff67adeb27c
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -809,7 +812,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 1a391f3c55dc9d4266552fa26d2a9839c6bafce4
-R e0f6471d5ee28bb7e8b533163f0964d8
-U dan
-Z 10956b1d9211fbb2df2844170c35e7df
+P c2bf693f933313991d85394009e79a7903037a18
+R 66f52b79291a06333c330de7251fee7d
+U drh
+Z 927b5dbd39ea7c4afbefd93b2669db7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFL4ExkoxKgR168RlERAs5HAJ4/lJHDDYoHFsKzUU6xoGqpUum/jACdEGQu
+hHBRmOLcDhAHMWw3gl463l0=
+=7r+U
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 28fe0eec15d0eb60dced43898fcd169dad139c60..3745f29224fa3ecda9bc240982c8d093a0a03c33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2bf693f933313991d85394009e79a7903037a18
\ No newline at end of file
+1465d3842c52aa7471f63deb47fe5b256d4e01c2
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 09f31a993904948dc950419bb6c0d581c0102cea..9db1ca86cc871f6970c10288062334afb18ccbf3 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -613,7 +613,7 @@ int sqlite3WalOpen(
   }
 
   if( rc!=SQLITE_OK ){
-    pVfs->xShmClose(pVfs, pRet->pWIndex, 0);
+    if( pRet->pWIndex ) pVfs->xShmClose(pVfs, pRet->pWIndex, 0);
     sqlite3OsClose(pRet->pFd);
     sqlite3_free(pRet);
   }else{