mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a possible (and probably harmless) uninitialized variable in STAT3/4.

Browse Source 
FossilOrigin-Name: 33ad4f91477907b7b3e5808c7ba11aacc9a83ba6
This commit is contained in:
drh 2013-12-03 19:16:06 +00:00
parent b5f68b0c8c
commit 7190e07fc0
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\san\salignment\sproblem\sin\sthe\sstat3/stat4\scode\saffecting\s32-bit\splatforms. C Fix\sa\spossible\s(and\sprobably\sharmless)\suninitialized\svariable\sin\sSTAT3/4.
D 2013-12-03T18:26:56.746 D 2013-12-03T19:16:06.615
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -286,7 +286,7 @@ F src/vdbeInt.h 05fbda0e061dbc4aaa2709a8cccf3515c245b263
F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
F src/vdbeaux.c 09b79d475f5af2b3b5068f639609d88e0ced9d95 F src/vdbeaux.c 09b79d475f5af2b3b5068f639609d88e0ced9d95
F src/vdbeblob.c 8cd05a5630e6d5563ad017bf82edaf812b28acde F src/vdbeblob.c 8cd05a5630e6d5563ad017bf82edaf812b28acde
F src/vdbemem.c d9811b08c4cda6f9108b49223aa0d3b07d595eb5 F src/vdbemem.c 20e349d2ca928802fc8f2d42a2cc488fd6981d3f
F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147 F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P b654a4ec729c86c6e94365fb0d3f83c598d4461a P 14f9bc79014e5762b88b9f0b98f4d47a8092d127
R 9b643eb26a4f573bb81c9ce75c7a93ef R a21a54e67ec7aa45fd701d0774acda83
U dan U drh
Z 1aa369240dc90be6769d251ab8ec5acc Z 49eaa17223688ae51427734254ac0a7e

2
manifest.uuid
View File

@ -1 +1 @@
14f9bc79014e5762b88b9f0b98f4d47a8092d127 33ad4f91477907b7b3e5808c7ba11aacc9a83ba6

6
src/vdbemem.c
View File

@ -1297,7 +1297,6 @@ int sqlite3Stat4ProbeSetValue(
pVal = valueNew(db, &alloc); pVal = valueNew(db, &alloc);
if( pVal ){ if( pVal ){
sqlite3VdbeMemSetNull((Mem*)pVal); sqlite3VdbeMemSetNull((Mem*)pVal);
*pbOk = 1;
} }
}else if( pExpr->op==TK_VARIABLE }else if( pExpr->op==TK_VARIABLE
|| NEVER(pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE) || NEVER(pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
@ -1313,16 +1312,13 @@ int sqlite3Stat4ProbeSetValue(
sqlite3ValueApplyAffinity(pVal, affinity, ENC(db)); sqlite3ValueApplyAffinity(pVal, affinity, ENC(db));
} }
pVal->db = pParse->db; pVal->db = pParse->db;
*pbOk = 1;
sqlite3VdbeMemStoreType((Mem*)pVal); sqlite3VdbeMemStoreType((Mem*)pVal);
} }
}else{
*pbOk = 0;
} }
}else{ }else{
rc = valueFromExpr(db, pExpr, ENC(db), affinity, &pVal, &alloc); rc = valueFromExpr(db, pExpr, ENC(db), affinity, &pVal, &alloc);
*pbOk = (pVal!=0);
} }
*pbOk = (pVal!=0);
assert( pVal==0 || pVal->db==db ); assert( pVal==0 || pVal->db==db );
return rc; return rc;