Additional defense against the rowid-fifo overflow problem. (CVS 2622)

FossilOrigin-Name: 881dcf5fb16997830ff347d2eb2610784b415f25

diff --git a/manifest b/manifest
index d22e9708303f5acd4621e8c5b9a3101d28f343d2..3a9f18d031682e96f30c5a551f8f065f79de14c1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sstray\sC++\sstyle\scomment\scausing\sproblems\sfor\ssome\scompilers.\s(CVS\s2621)
-D 2005-08-24T16:54:05
+C Additional\sdefense\sagainst\sthe\srowid-fifo\soverflow\sproblem.\s(CVS\s2622)
+D 2005-08-24T17:07:38
 F Makefile.in b109ddb46a5550d0732dcd6caca01c123f6d5cdd
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -82,7 +82,7 @@ F src/util.c f4678297585c69811724468554393b898548e9c6
 F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c
 F src/vdbe.c 69f33e22c7d0a64b23fbb69e6da95a1bb6869032
 F src/vdbe.h 3b29a9af6c7a64ed692bef1fc5f61338f40d2f67
-F src/vdbeInt.h 9be9a6c43d38124bd03cc5cf05715605b1789fd9
+F src/vdbeInt.h 89a7fa5dc35477bd30ea27b0bf38e9e5c2903812
 F src/vdbeapi.c 7790e9f8da2dde29510a196d1e41ff53da7eb8a8
 F src/vdbeaux.c 874624698fad54a59c6a0bcccea9d5aaa8655ab6
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
@@ -298,7 +298,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 7c599bae33ba4eb10fc486ae3dab76330ce69936
-R 381eac69e5e96973f936215326a0bace
+P aa7dd3f2c72335fe7778c021e4b6bbbc4ec322df
+R 88028b7e2a4409662feaad4ce9d2d230
 U drh
-Z f5aec42c541d58f1f45bc7db39e5e79c
+Z bcc37c9c982f637d004abc9c28de8320

diff --git a/manifest.uuid b/manifest.uuid
index c8b4a46b191dd59a95443bdac4f7c63449e3c5a1..45616979e6f5ebb932ad7fb97e88d641238b1d08 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa7dd3f2c72335fe7778c021e4b6bbbc4ec322df
\ No newline at end of file
+881dcf5fb16997830ff347d2eb2610784b415f25
\ No newline at end of file

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 0b3e35fa02467e81748aff56d319158522ab22bf..7bf2a0ec5dc4c7c5bb30588504a40555a9129f1f 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -265,9 +265,9 @@ struct Set {
 */
 typedef struct FifoPage FifoPage;
 struct FifoPage {
-  u16 nSlot;         /* Number of entries aSlot[] */
-  u16 iWrite;        /* Push the next value into this entry in aSlot[] */
-  i16 iRead;         /* Read the next value from this entry in aSlot[] */
+  int nSlot;         /* Number of entries aSlot[] */
+  int iWrite;        /* Push the next value into this entry in aSlot[] */
+  int iRead;         /* Read the next value from this entry in aSlot[] */
   FifoPage *pNext;   /* Next page in the fifo */
   i64 aSlot[1];      /* One or more slots for rowid values */
 };