If an sqlite3_mprintf() call uses a disallowed internal-use-only conversion

character, then abort the call with a -1 error code.  Ticket #1818. (CVS 3187)

FossilOrigin-Name: 9d7297b9ef6ca2f35116e37f993bb029cf03d4f0
This commit is contained in:
drh 2006-05-22 22:04:00 +00:00
parent db5138885b
commit c44135657c
3 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C Adjust\sthe\sdefault\sweights\son\sindices\sso\sthat\san\sindex\sthat\smatches\smore\nterms\sof\sthe\swhere\sclause\swins\s(by\sdefault)\sover\sone\sthat\smatches\sfewer.\nTicket\s#1808.\s(CVS\s3186)
D 2006-05-11T23:14:59
C If\san\ssqlite3_mprintf()\scall\suses\sa\sdisallowed\sinternal-use-only\sconversion\ncharacter,\sthen\sabort\sthe\scall\swith\sa\s-1\serror\scode.\s\sTicket\s#1818.\s(CVS\s3187)
D 2006-05-22T22:04:00
F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@ -64,7 +64,7 @@ F src/pager.h 43f32f3847421f7502cfbb66f4eb2302b8033818
F src/parse.y ee1887ce0e6eea15cc728913ad3462898f88e9b0
F src/pragma.c 27d5e395c5d950931c7ac4fe610e7c2993e2fa55
F src/prepare.c 6afd730cc8851c0920b5f9050294646b1c2ab28c
F src/printf.c 358b4b585270f92a228e646e7bbb261c65f2a166
F src/printf.c 7029e5f7344a478394a02c52837ff296ee1ab240
F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
F src/select.c 8daba07a04a6d41f5267ea8353324cbe5a210e14
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 8be6a39d7108839b0fb298a2d536d68ebca86d66
R ca37ef1e70cde1be97fa0ecd09fa17b0
P 249b579f83b2922e3e03037186a9402af951e6d1
R a4cc6ce39f4291b2e5ea3f338666a67e
U drh
Z 6c8fcc37f137fc75f72b520deac05cb8
Z b43f086e88f28ee93e96a6ef04d5296a

View File

@ -1 +1 @@
249b579f83b2922e3e03037186a9402af951e6d1
9d7297b9ef6ca2f35116e37f993bb029cf03d4f0

View File

@ -333,6 +333,8 @@ static int vxprintf(
infop = &fmtinfo[idx];
if( useExtended || (infop->flags & FLAG_INTERN)==0 ){
xtype = infop->type;
}else{
return -1;
}
break;
}