Add an assert() to demonstrate that Klockworks is wrong about an aleged bug. (CVS...

FossilOrigin-Name: 0910022be3ec8ce540e0e6adce2eed7a7cd28fd3

diff --git a/manifest b/manifest
index c17c5055e21c0cc2bc3400c4a24cb7bafdd673a0..01785ee4a9f6e096b90b2342dcbdae14b5bdf3de 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\snames\sreturned\sfrom\sa\squery\sagainst\sa\sview.\s\sTicket\s#1709,\s#1688,\s#1711.\s(CVS\s3128)
-D 2006-03-09T17:28:12
+C Add\san\sassert()\sto\sdemonstrate\sthat\sKlockworks\sis\swrong\sabout\san\saleged\sbug.\s(CVS\s3129)
+D 2006-03-11T12:04:18
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c 451b34fc4eb2475ca76a2e86b21e1030a9428091
 F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a
 F src/attach.c d73a3505de3fb9e373d0a158978116c4212031d0
 F src/auth.c 9ae84d2d94eb96195e04515715e08e85963e96c2
-F src/btree.c 3f3b6ccdf8ea59dd736bf3f8fb2061947fa4bd4d
+F src/btree.c 861f6a805b55dbf37a35a0561e0cf5e99ed073ae
 F src/btree.h 40055cfc09defd1146bc5b922399c035f969e56d
 F src/build.c 98b458e30906461777ff1e003eef2db14c37314f
 F src/callback.c 1bf497306c32229114f826707054df7ebe10abf2
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b4d3e0d528c7d17fa3d05956a188cd4d431204b2
-R 51935685599ad30afbcbf808bc91dbf7
+P 36830fafa405c9eae4795045efc6843394c67555
+R 49e02133024179ffb0fdf1048751534a
 U drh
-Z 36810395a2addfbb68c63e8614294e10
+Z 526a9d7b9b1e35a7ab2038e1353a52ca

diff --git a/manifest.uuid b/manifest.uuid
index 5b2b34da5d4db8eeb23c146c975d0473e622c93f..962b41c9cb33a59ef8aeb640f813e5469a0e1ce3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36830fafa405c9eae4795045efc6843394c67555
\ No newline at end of file
+0910022be3ec8ce540e0e6adce2eed7a7cd28fd3
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index f3f233686a731161872844b4dc1bafc12294321b..964c955ec60be7bf62b95d9c93b87378fa198d53 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.317 2006/03/06 20:55:46 drh Exp $
+** $Id: btree.c,v 1.318 2006/03/11 12:04:18 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -4069,6 +4069,7 @@ static int fillInCell(
     n = nPayload;
     if( n>spaceLeft ) n = spaceLeft;
     if( n>nSrc ) n = nSrc;
+    assert( pSrc );
     memcpy(pPayload, pSrc, n);
     nPayload -= n;
     pPayload += n;