From: drh <drh@noemail.net>
Date: Thu, 20 Feb 2014 19:23:15 +0000 (+0000)
Subject: Make sure that the difference between two string pointers is passed into
X-Git-Tag: version-3.8.4~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4300c1ae3b5464e2a11c20eec3cf1139f161799a;p=thirdparty%2Fsqlite.git

Make sure that the difference between two string pointers is passed into
sqlite3_mprintf() as type "int".

FossilOrigin-Name: d5d973fedcf5a2eea219f10e11ba3dacdd0593f0
---

diff --git a/manifest b/manifest
index 2b91bf1936..e726d97238 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sVdbeCoverageNeverTaken()\smacro,\sand\scomments\sthat\sbetter\sdescribe\show\nthe\sVDBE\sbranch\scoverage\smeasurement\sworks.\s\sAdd\ssome\stags\sto\sprovide\s100%\nVDBE\sbranch\scoverage.
-D 2014-02-19T19:14:34.983
+C Make\ssure\sthat\sthe\sdifference\sbetween\stwo\sstring\spointers\sis\spassed\sinto\nsqlite3_mprintf()\sas\stype\s"int".
+D 2014-02-20T19:23:15.279
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -156,7 +156,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 75a0b861e98968c0f3b27606e7d9462228d04827
+F src/alter.c 5d99edbac5bc416032772b723ee30182ee6e5de0
 F src/analyze.c 69761e1677142d180a9f55250dee2952f45e4793
 F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
@@ -1151,7 +1151,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P d2c047f304848e49864ed8c216b48fd671fa3916
-R 290109175fc6aecf9e37def55ff4d8d1
+P c1e94169dd8eb80b4d18c73be9f81585330d11ad
+R 09bf9547df25315bb17290d72fbff966
 U drh
-Z 8351cefc3ed205778666dc9ef6e2430a
+Z 6fdf325f579b53033b4ff3e16a9cc3b3
diff --git a/manifest.uuid b/manifest.uuid
index a6ed2e8a06..1b31602821 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1e94169dd8eb80b4d18c73be9f81585330d11ad
\ No newline at end of file
+d5d973fedcf5a2eea219f10e11ba3dacdd0593f0
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index e9f06a9f72..1a83e570db 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -77,8 +77,8 @@ static void renameTableFunc(
       assert( len>0 );
     } while( token!=TK_LP && token!=TK_USING );
 
-    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, 
-       zTableName, tname.z+tname.n);
+    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", (int)(((u8*)tname.z) - zSql),
+       zSql, zTableName, tname.z+tname.n);
     sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
   }
 }
@@ -130,7 +130,7 @@ static void renameParentFunc(
       sqlite3Dequote(zParent);
       if( 0==sqlite3StrICmp((const char *)zOld, zParent) ){
         char *zOut = sqlite3MPrintf(db, "%s%.*s\"%w\"", 
-            (zOutput?zOutput:""), z-zInput, zInput, (const char *)zNew
+            (zOutput?zOutput:""), (int)(z-zInput), zInput, (const char *)zNew
         );
         sqlite3DbFree(db, zOutput);
         zOutput = zOut;
@@ -216,8 +216,8 @@ static void renameTriggerFunc(
     /* Variable tname now contains the token that is the old table-name
     ** in the CREATE TRIGGER statement.
     */
-    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, 
-       zTableName, tname.z+tname.n);
+    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", (int)(((u8*)tname.z) - zSql),
+       zSql, zTableName, tname.z+tname.n);
     sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
   }
 }