1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00

Fixes for uninitialized variables. Tickets #2658 and #2659. (CVS 4437)

FossilOrigin-Name: 27fe1288336665c4d47c5d7ddcbeacc451ec4a9d
This commit is contained in:
drh
2007-09-20 10:02:54 +00:00
parent 25c0d1a18a
commit 777b17af7e
4 changed files with 14 additions and 14 deletions

View File

@@ -1,5 +1,5 @@
C The\scode\sis\scorrect\sas\sit\scontains\san\sassert(3)\sin\sthe\s"default"\sswitch\ncase,\sbut\sGCC\s4.3\sis\snot\sable\sto\sdetect\sthis\sand\sinstead\scomplains\nwith\s"warning:\s'amode'\smay\sbe\sused\suninitialized\sin\sthis\sfunction".\nHence,\salthough\sthe\sassert(3)\salready\sprotects\sthe\scode\shere,\sget\srid\sof\nthis\scompiler\swarning\sby\sdoing\sa\ssimple\sinitialization\sof\sthe\s"amode"\nvariable.\s(CVS\s4436) C Fixes\sfor\suninitialized\svariables.\s\sTickets\s#2658\sand\s#2659.\s(CVS\s4437)
D 2007-09-20T08:38:15 D 2007-09-20T10:02:54
F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -116,7 +116,7 @@ F src/os_os2.c 5b5f42180c5961b9d207748fda8f9aa0e70569c8
F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c 89283ae67b4830c5d62adb8dec5b430dc1a407d1 F src/os_unix.c 308bd8ad6977f66f608228cccaecc4cbc1a24693
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c e638300494c492a460c76561a345dae1671c30f0 F src/os_win.c e638300494c492a460c76561a345dae1671c30f0
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -172,7 +172,7 @@ F src/vdbeaux.c e35c851e3c1d18a7b90dbe35ae5e0fc9419a4ed4
F src/vdbeblob.c 82f51cdf9b0c0af729732fde48c824e498c0a1ca F src/vdbeblob.c 82f51cdf9b0c0af729732fde48c824e498c0a1ca
F src/vdbefifo.c 334c838c8f42d61a94813d136019ee566b5dc2f6 F src/vdbefifo.c 334c838c8f42d61a94813d136019ee566b5dc2f6
F src/vdbemem.c 246d434fa60bde6553490eb686adfd86adcd6712 F src/vdbemem.c 246d434fa60bde6553490eb686adfd86adcd6712
F src/vtab.c 6776605198e0b844391335f1b77e3595b3616331 F src/vtab.c 243f41bd94a710e8d1eb30f0abfe6d0889538e71
F src/where.c 44042c8b9d0d054cc318c3a0df052215ebf49d2d F src/where.c 44042c8b9d0d054cc318c3a0df052215ebf49d2d
F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -580,7 +580,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 5c41619e292699c72231cff10e26dfbe9a363a00 P 91831ff2922666b39d8f4ba448982c6763030633
R e4223310be7efe080ee8a56ed8385f11 R b3e2e386d4621bf8e0cec5124924d72e
U rse U drh
Z 9fd1174c608fad45cd8dd99f9bda9af0 Z bfc1344953fd378c8e37f74827865187

View File

@@ -1 +1 @@
91831ff2922666b39d8f4ba448982c6763030633 27fe1288336665c4d47c5d7ddcbeacc451ec4a9d

View File

@@ -2290,7 +2290,7 @@ static int fillInUnixFile(
*/ */
static int openDirectory(const char *zFilename, int *pFd){ static int openDirectory(const char *zFilename, int *pFd){
int ii; int ii;
int fd; int fd = -1;
char zDirname[MAX_PATHNAME+1]; char zDirname[MAX_PATHNAME+1];
sqlite3_snprintf(MAX_PATHNAME, zDirname, "%s", zFilename); sqlite3_snprintf(MAX_PATHNAME, zDirname, "%s", zFilename);
@@ -2298,7 +2298,7 @@ static int openDirectory(const char *zFilename, int *pFd){
if( ii>0 ){ if( ii>0 ){
zDirname[ii] = '\0'; zDirname[ii] = '\0';
fd = open(zDirname, O_RDONLY|O_BINARY, 0); fd = open(zDirname, O_RDONLY|O_BINARY, 0);
if( fd>0 ){ if( fd>=0 ){
#ifdef FD_CLOEXEC #ifdef FD_CLOEXEC
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0) | FD_CLOEXEC); fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0) | FD_CLOEXEC);
#endif #endif
@@ -2306,7 +2306,7 @@ static int openDirectory(const char *zFilename, int *pFd){
} }
} }
*pFd = fd; *pFd = fd;
return (fd>0?SQLITE_OK:SQLITE_CANTOPEN); return (fd>=0?SQLITE_OK:SQLITE_CANTOPEN);
} }
/* /*

View File

@@ -11,7 +11,7 @@
************************************************************************* *************************************************************************
** This file contains code used to help implement virtual tables. ** This file contains code used to help implement virtual tables.
** **
** $Id: vtab.c,v 1.57 2007/09/04 15:38:58 danielk1977 Exp $ ** $Id: vtab.c,v 1.58 2007/09/20 10:02:54 drh Exp $
*/ */
#ifndef SQLITE_OMIT_VIRTUALTABLE #ifndef SQLITE_OMIT_VIRTUALTABLE
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -748,7 +748,7 @@ FuncDef *sqlite3VtabOverloadFunction(
void (*xFunc)(sqlite3_context*,int,sqlite3_value**); void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
void *pArg; void *pArg;
FuncDef *pNew; FuncDef *pNew;
int rc; int rc = 0;
char *zLowerName; char *zLowerName;
unsigned char *z; unsigned char *z;