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

Fix the %c format character in sqlite3VXPrintf() so that it correctly

Browse Source 
handles precisions larger than 70.

FossilOrigin-Name: 08a27440f19b7fc884464832e6105af1bf008172
This commit is contained in:
drh 2014-10-29 18:20:18 +00:00
parent 22e8d833f0
commit af8f513f9d
5 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@ -1,5 +1,5 @@
C In\sthe\sOP_Column\sopcode,\swhen\sextracting\sa\sfield\sthat\sis\spast\sthe\send\sof\na\sshort\srecord\s(because\sthe\srow\swas\soriginally\sinserted\sprior\sto\sALTER\sTABLE\nADD\sCOLUMN)\sthen\smake\ssure\sthe\soutput\sregister\sis\sfully\sNULL\sand\sdoes\snot\ncontain\sleftover\sflags\s(such\sas\sMEM_Ephem)\sfrom\sits\sprevious\suse.\nFix\sfor\sticket\s[43107840f1c02]. C Fix\sthe\s%c\sformat\scharacter\sin\ssqlite3VXPrintf()\sso\sthat\sit\scorrectly\nhandles\sprecisions\slarger\sthan\s70.
D 2014-10-29T00:58:38.898 D 2014-10-29T18:20:18.932
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -223,7 +223,7 @@ F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5 F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7 F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
F src/printf.c c31012ac23e458081df4a32634b60424e0cdfaf3 F src/printf.c 10a2493593c8e4a538915cd3674bd7a67f70c488
F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952 F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
@ -232,7 +232,7 @@ F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
F src/sqlite.h.in 737b7dd0f3f81fe183646d22828b39f85ef3e68c F src/sqlite.h.in 737b7dd0f3f81fe183646d22828b39f85ef3e68c
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
F src/sqliteInt.h 90519c3b3e8ee90adfce013234c4bd07275d77b5 F src/sqliteInt.h 4f86ac648ea398c1bb3db036062934cde257ea23
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 81712116e826b0089bb221b018929536b2b5406f F src/status.c 81712116e826b0089bb221b018929536b2b5406f
F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
@ -772,7 +772,7 @@ F test/permutations.test cef25f5e8499a15846eccd06785f17f4180407ab
F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13 F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1 F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
@ -1209,7 +1209,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P f84af4adcc34d7a4c72027bf5b038a1a45a4c307 P 24780f8ddc1683fc62180e6961dc6bfe1168f4df
R c2870e402bb1970025fb678b8c13d710 R c12283d048765bdbe52bad70443f70c1
U drh U drh
Z 3a55744e14b55dcc32cb71f070af972c Z 8aeb3112f50d033e0580c4400e41dd66

2
manifest.uuid
View File

@ -1 +1 @@
24780f8ddc1683fc62180e6961dc6bfe1168f4df 08a27440f19b7fc884464832e6105af1bf008172

33
src/printf.c
View File

@ -212,7 +212,7 @@ void sqlite3VXPrintf(
const et_info *infop; /* Pointer to the appropriate info structure */ const et_info *infop; /* Pointer to the appropriate info structure */
char *zOut; /* Rendering buffer */ char *zOut; /* Rendering buffer */
int nOut; /* Size of the rendering buffer */ int nOut; /* Size of the rendering buffer */
char *zExtra; /* Malloced memory used by some conversion */ char *zExtra = 0; /* Malloced memory used by some conversion */
#ifndef SQLITE_OMIT_FLOATING_POINT #ifndef SQLITE_OMIT_FLOATING_POINT
int exp, e2; /* exponent of real numbers */ int exp, e2; /* exponent of real numbers */
int nsd; /* Number of significant digits returned */ int nsd; /* Number of significant digits returned */
@ -336,7 +336,6 @@ void sqlite3VXPrintf(
break; break;
} }
} }
zExtra = 0;
/* /*
** At this point, variables are initialized as follows: ** At this point, variables are initialized as follows:
@ -627,13 +626,16 @@ void sqlite3VXPrintf(
}else{ }else{
c = va_arg(ap,int); c = va_arg(ap,int);
} }
buf[0] = (char)c; if( precision>1 ){
if( precision>=0 ){ width -= precision-1;
for(idx=1; idx<precision; idx++) buf[idx] = (char)c; if( width>1 && !flag_leftjustify ){
length = precision; sqlite3AppendChar(pAccum, width-1, ' ');
}else{ width = 0;
length =1; }
sqlite3AppendChar(pAccum, precision-1, c);
} }
length = 1;
buf[0] = c;
bufpt = buf; bufpt = buf;
break; break;
case etSTRING: case etSTRING:
@ -734,11 +736,14 @@ void sqlite3VXPrintf(
** the output. ** the output.
*/ */
width -= length; width -= length;
if( width>0 && !flag_leftjustify ) sqlite3AppendSpace(pAccum, width); if( width>0 && !flag_leftjustify ) sqlite3AppendChar(pAccum, width, ' ');
sqlite3StrAccumAppend(pAccum, bufpt, length); sqlite3StrAccumAppend(pAccum, bufpt, length);
if( width>0 && flag_leftjustify ) sqlite3AppendSpace(pAccum, width); if( width>0 && flag_leftjustify ) sqlite3AppendChar(pAccum, width, ' ');
if( zExtra ) sqlite3_free(zExtra); if( zExtra ){
sqlite3_free(zExtra);
zExtra = 0;
}
}/* End for loop over the format string */ }/* End for loop over the format string */
} /* End of function */ } /* End of function */
@ -791,11 +796,11 @@ static int sqlite3StrAccumEnlarge(StrAccum *p, int N){
} }
/* /*
** Append N space characters to the given string buffer. ** Append N copies of character c to the given string buffer.
*/ */
void sqlite3AppendSpace(StrAccum *p, int N){ void sqlite3AppendChar(StrAccum *p, int N, char c){
if( p->nChar+N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ) return; if( p->nChar+N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ) return;
while( (N--)>0 ) p->zText[p->nChar++] = ' '; while( (N--)>0 ) p->zText[p->nChar++] = c;
} }
/* /*

2
src/sqliteInt.h
View File

@ -3543,7 +3543,7 @@ int sqlite3OpenTempDatabase(Parse *);
void sqlite3StrAccumInit(StrAccum*, char*, int, int); void sqlite3StrAccumInit(StrAccum*, char*, int, int);
void sqlite3StrAccumAppend(StrAccum*,const char*,int); void sqlite3StrAccumAppend(StrAccum*,const char*,int);
void sqlite3StrAccumAppendAll(StrAccum*,const char*); void sqlite3StrAccumAppendAll(StrAccum*,const char*);
void sqlite3AppendSpace(StrAccum*,int); void sqlite3AppendChar(StrAccum*,int,char);
char *sqlite3StrAccumFinish(StrAccum*); char *sqlite3StrAccumFinish(StrAccum*);
void sqlite3StrAccumReset(StrAccum*); void sqlite3StrAccumReset(StrAccum*);
void sqlite3SelectDestInit(SelectDest*,int,int); void sqlite3SelectDestInit(SelectDest*,int,int);

20
test/printf2.test
View File

@ -95,5 +95,25 @@ do_execsql_test printf2-2.3 {
SELECT printf('%s=(%d/%g/%s)',a) FROM t1 ORDER BY a; SELECT printf('%s=(%d/%g/%s)',a) FROM t1 ORDER BY a;
} {-1=(0/0/) 1=(0/0/) 1.5=(0/0/) abc=(0/0/)} } {-1=(0/0/) 1=(0/0/) 1.5=(0/0/) abc=(0/0/)}
# The precision of the %c conversion causes the character to repeat.
#
do_execsql_test printf2-3.1 {
SELECT printf('|%110.100c|','*');
} {{| ****************************************************************************************************|}}
do_execsql_test printf2-3.2 {
SELECT printf('|%-110.100c|','*');
} {{|**************************************************************************************************** |}}
do_execsql_test printf2-3.3 {
SELECT printf('|%9.8c|%-9.8c|','*','*');
} {{| ********|******** |}}
do_execsql_test printf2-3.4 {
SELECT printf('|%8.8c|%-8.8c|','*','*');
} {|********|********|}
do_execsql_test printf2-3.5 {
SELECT printf('|%7.8c|%-7.8c|','*','*');
} {|********|********|}
finish_test finish_test