From: drh Date: Sun, 22 Jul 2007 19:10:20 +0000 (+0000) Subject: Fix a bad sizeof in vdbe.c. Ticket #2522. (CVS 4174) X-Git-Tag: version-3.6.10~2000 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad6b3159be6aa923149733c1c584b7471b04830a;p=thirdparty%2Fsqlite.git Fix a bad sizeof in vdbe.c. Ticket #2522. (CVS 4174) FossilOrigin-Name: 77ebc3feb089c28155cf20873fb4eabd26fa50c1 --- diff --git a/manifest b/manifest index ca6c2fe4ed..e4f8f88fba 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Work\saround\sa\sbug\sin\sGCC.\s\sTicket\s#2469.\s(CVS\s4173) -D 2007-07-21T19:41:46 +C Fix\sa\sbad\ssizeof\sin\svdbe.c.\s\sTicket\s#2522.\s(CVS\s4174) +D 2007-07-22T19:10:21 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -140,7 +140,7 @@ F src/update.c 6b10becb6235ea314ed245fbfbf8b38755e3166e F src/utf.c 01b2aba02b10d12903e9e1ff897215c9faf6b662 F src/util.c 9e81d417fc60bd2fe156f8f2317aa4845bc6cc90 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef -F src/vdbe.c 033d1e6b5a8c0e3c00814be511794bc0bba65a9f +F src/vdbe.c a58fe70f11078deb16f6825cc99f099d2fad4a7b F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3 F src/vdbeInt.h c3514903cad9e36d6b3242be20261351d09db56c F src/vdbeapi.c fe3b713d5d37f8dfff1aa7546dae213a0e492f10 @@ -520,7 +520,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P b2ba3e81fb1015d6f979a490e00a45fb7d5e1a9a -R 98e7d4563683ff4f0fd6aaa8c5f897e7 +P 1924ba5207bdc8d503c17cd9460c1a9f9c357635 +R 6a3d5d19ad9da4a9718db45f3a6f4e18 U drh -Z c1549627a310aa52c2312d26c9b8db66 +Z f3b0c8bff800cc59d8eb156576c3d0e8 diff --git a/manifest.uuid b/manifest.uuid index 2ac4947399..a8c8af68c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1924ba5207bdc8d503c17cd9460c1a9f9c357635 \ No newline at end of file +77ebc3feb089c28155cf20873fb4eabd26fa50c1 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index aa1ab0ab86..2c40b4cf6c 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.637 2007/07/21 19:41:46 drh Exp $ +** $Id: vdbe.c,v 1.638 2007/07/22 19:10:21 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -4299,7 +4299,7 @@ case OP_IntegrityCk: { if( (pTos[-nRoot].flags & MEM_Int)==0 ) break; } assert( nRoot>0 ); - aRoot = sqliteMallocRaw( sizeof(int*)*(nRoot+1) ); + aRoot = sqliteMallocRaw( sizeof(int)*(nRoot+1) ); if( aRoot==0 ) goto no_mem; j = pOp->p1; assert( j>=0 && jnMem );