From: drh <drh@noemail.net>
Date: Mon, 28 Nov 2005 12:36:35 +0000 (+0000)
Subject: Replace a call to sprintf() with sqlite3MPrintf() since on some embedded
X-Git-Tag: version-3.6.10~3370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9267bdcecdb472ee6d302e25fc27b6e936eb57a6;p=thirdparty%2Fsqlite.git

Replace a call to sprintf() with sqlite3MPrintf() since on some embedded
platforms, sprintf() is busted.  Need to go through and do similar replacements
elsewhere in the code. (CVS 2790)

FossilOrigin-Name: 1b4f2d89bbe833359cefcea580783fd92aa7b8ab
---

diff --git a/manifest b/manifest
index b3078aeaa5..4ee323f0aa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\sOR-clause\soptimization\sif\sit\sdoes\snot\sresult\sin\san\sindex\sbeing\nused\sthat\swould\snot\shave\sbeen\sused\sotherwise.\s\sIn\sother\swords,\sdo\snot\nconvert\sOR\sclauses\sinto\san\sIN\sstatement\sif\sit\sdoes\snot\shelp\sthe\soptimizer.\s(CVS\s2789)
-D 2005-11-26T14:24:41
+C Replace\sa\scall\sto\ssprintf()\swith\ssqlite3MPrintf()\ssince\son\ssome\sembedded\nplatforms,\ssprintf()\sis\sbusted.\s\sNeed\sto\sgo\sthrough\sand\sdo\ssimilar\sreplacements\nelsewhere\sin\sthe\scode.\s(CVS\s2790)
+D 2005-11-28T12:36:36
 F Makefile.in 28a2772cd9e03ba758c2a052813092cdb9da73bf
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -42,7 +42,7 @@ F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79
 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
 F src/delete.c 29dac493f4d83b05f91233b116827c133bcdab72
 F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d
-F src/expr.c 3b1a24aab6a17e7cc62d904eba802beccc3e925f
+F src/expr.c b18a7dc6ebff2351abf35ff914465e2341038d34
 F src/func.c 7d81dccd9c440c6c4e761056333e629192814af0
 F src/hash.c 8747cf51d12de46512880dfcf1b68b4e24072863
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
@@ -323,7 +323,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P cbbeb9de0019a0b81318158711590078fcb7e98a
-R 067bd3867a5225e7924889dcec0a8fc0
+P 7e7cfce0f8ed2a6e04747736a2c68484f447cdfb
+R 34f591d26adade3953279102265da94b
 U drh
-Z a4ac09e883a7ba726f3dc764bd2b73b6
+Z a721118f67e524e11c01a78c05611f0f
diff --git a/manifest.uuid b/manifest.uuid
index 8c77b9ff1b..77360b68cf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e7cfce0f8ed2a6e04747736a2c68484f447cdfb
\ No newline at end of file
+1b4f2d89bbe833359cefcea580783fd92aa7b8ab
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 0a31ab47b1..24def4f39f 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.238 2005/11/16 12:53:15 drh Exp $
+** $Id: expr.c,v 1.239 2005/11/28 12:36:36 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1614,8 +1614,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
       assert( pLeft );
       if( pLeft->op==TK_FLOAT || pLeft->op==TK_INTEGER ){
         Token *p = &pLeft->token;
-        char *z = sqliteMalloc( p->n + 2 );
-        sprintf(z, "-%.*s", p->n, p->z);
+        char *z = sqlite3MPrintf("-%.*s", p->n, p->z);
         if( pLeft->op==TK_FLOAT ){
           sqlite3VdbeOp3(v, OP_Real, 0, 0, z, p->n+1);
         }else{