Fix for ticket #812 in the 2.8 branch. (CVS 1801)

FossilOrigin-Name: ea364dffc7dfe7533d6916d63db0a79181440e64

diff --git a/manifest b/manifest
index 2fc9e335472914694854450878655b6b65f7bb89..6b6f49883d7dd72e689e9d89c0cf69653d4ed7dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sSrcList.nSrc\sa\ssigned\squantity\sto\savoid\sproblems\son\sAIX.\s(CVS\s1795)
-D 2004-07-15T13:37:05
+C Fix\sfor\sticket\s#812\sin\sthe\s2.8\sbranch.\s(CVS\s1801)
+D 2004-07-17T21:59:18
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -44,7 +44,7 @@ F src/pager.c b246986e5ba31b15aa3cf91d3b9ec2e608aceb8e
 F src/pager.h 82332878799280145639a48d88cdb4058925e3f6
 F src/parse.y 023720cb8c3bef74e51738bca78335d0dc6d2cfd
 F src/pragma.c f9c157b0591419d2d3407dac90222020d2a6d822
-F src/printf.c 8c58b7b6d4069eec6ebe2d46bdbc3a89a367bf95
+F src/printf.c 378ec63d9303993eef24814a56a9fc7260aacbea
 F src/random.c 775913e0b7fbd6295d21f12a7bd35b46387c44b2
 F src/select.c 3833e2b64cc6d249385ee44e13bf49c9ae5b903d
 F src/shell.c 920af040d3a33ea8919c82cee45b424ad841cee0
@@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 296528b281025d86650cf0e4c17e75c296e03310
-R a87120f7da504d521f6270175df033a6
+P 41526d098dcae6def4940cd464d0e1e673c6abb5
+R dc7d58b1f667e10493476b8cb056afde
 U drh
-Z a7ca373e4e0423373db283aef372ee6a
+Z 05e8ac77c8d502f50a18d54914bc52cb

diff --git a/manifest.uuid b/manifest.uuid
index 29921fda35c9b049c0eb2e3f5d4a234c20fbce7b..4d9a56a85c50afc35e3816e929514180a6e689cf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-41526d098dcae6def4940cd464d0e1e673c6abb5
\ No newline at end of file
+ea364dffc7dfe7533d6916d63db0a79181440e64
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 620578d76ee356a2a584c94d73f1ccf9bd1e65b7..f867d62af61a581f351e3b372019a18be19db351 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -227,6 +227,7 @@ static int vxprintf(
   int nsd;                   /* Number of significant digits returned */
 #endif
 
+  func(arg,"",0);
   count = length = 0;
   bufpt = 0;
   for(; (c=(*fmt))!=0; ++fmt){
@@ -673,9 +674,11 @@ static void mout(void *arg, const char *zNewText, int nNewChar){
       }
     }
   }
-  if( pM->zText && nNewChar>0 ){
-    memcpy(&pM->zText[pM->nChar], zNewText, nNewChar);
-    pM->nChar += nNewChar;
+  if( pM->zText ){
+    if( nNewChar>0 ){
+      memcpy(&pM->zText[pM->nChar], zNewText, nNewChar);
+      pM->nChar += nNewChar;
+    }
     pM->zText[pM->nChar] = 0;
   }
 }