From 3a200e0a44f917094c7ccfbe8ee53ced68331038 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 11 Apr 2008 19:18:24 +0000 Subject: [PATCH] Avoid the use of uninitialized variables in sqlite3GenerateRowIndexDelete. Ticket #3048. (CVS 4991) FossilOrigin-Name: a93b7a344a713a9ed9d72be4707eb28c2979648c --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/delete.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 19f50513a6..8b0545f6b2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sa\srecently\sadded\sassert()\sthat\sis\sfailing\swith\scertain\scompilers\son\s32-bit\splatforms.\sTicket\s#3043.\s(CVS\s4990) -D 2008-04-11T17:15:47 +C Avoid\sthe\suse\sof\suninitialized\svariables\sin\ssqlite3GenerateRowIndexDelete.\nTicket\s#3048.\s(CVS\s4991) +D 2008-04-11T19:18:25 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -93,7 +93,7 @@ F src/build.c e6f17bbb031c78e55389e3b90cd5cb150efef2b1 F src/callback.c 77b302b0d41468dcda78c70e706e5b84577f0fa0 F src/complete.c 4cf68fd75d60257524cbe74f87351b9848399131 F src/date.c e41ce4513fb0e359dc678d6bddb4ace135fe365d -F src/delete.c 74d5c9c824848a14d7dee37264ec302b168c4ddb +F src/delete.c 555cedf9e59db9ead1c2f8db0c4344201ea7caaa F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b F src/expr.c 4b6cc2496999bda069a9e00db9c2d7ccdf01a129 F src/fault.c 83057e86815d473e526f7df0b0108dfdd022ff23 @@ -627,7 +627,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 349aab42c7896f04ecb6ca33f08a4c194051e837 -R 634fdd977734aaaf019f0fc0925e8ad5 -U danielk1977 -Z 3119d76022deaffdd36833a387e7aabe +P 03c0279d7b004ccc4264143e366c793b4d774f9f +R 72b1ed2a0366710f33a40f7fc1d822b1 +U drh +Z 00cf749f4a1eca48ead98ab1077543fc diff --git a/manifest.uuid b/manifest.uuid index 74035d7954..f1baf4d250 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -03c0279d7b004ccc4264143e366c793b4d774f9f \ No newline at end of file +a93b7a344a713a9ed9d72be4707eb28c2979648c \ No newline at end of file diff --git a/src/delete.c b/src/delete.c index aee94188d9..64ce044c1e 100644 --- a/src/delete.c +++ b/src/delete.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** in order to generate code for DELETE FROM statements. ** -** $Id: delete.c,v 1.166 2008/04/01 05:07:15 drh Exp $ +** $Id: delete.c,v 1.167 2008/04/11 19:18:25 drh Exp $ */ #include "sqliteInt.h" @@ -490,7 +490,7 @@ void sqlite3GenerateRowIndexDelete( for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){ if( aRegIdx!=0 && aRegIdx[i-1]==0 ) continue; - r1 = sqlite3GenerateIndexKey(pParse, pIdx, iCur, r1, 0); + r1 = sqlite3GenerateIndexKey(pParse, pIdx, iCur, 0, 0); sqlite3VdbeAddOp3(pParse->pVdbe, OP_IdxDelete, iCur+i, r1,pIdx->nColumn+1); } }