Further fixes to the P4_MEM size measurement logic.

FossilOrigin-Name: 934cda2987c331b57a195ed45e9a91794896672a

diff --git a/manifest b/manifest
index e075451f6d4b4f3edaeb6374c8247c438167b2cd..b2ca4a87df976444a6a24ccf0d5f58612170c505 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\san\sissue\swith\sP4_MEM\sand\sthe\sschema\ssize\smeasurement\slogic.\s\sAlso\sfix\na\scompiler\swarning.
-D 2010-07-26T13:58:00
+C Further\sfixes\sto\sthe\sP4_MEM\ssize\smeasurement\slogic.
+D 2010-07-26T14:20:07
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -225,7 +225,7 @@ F src/vdbe.c cefff41564b68a412e65e6a1013ec1b1c1ece6c4
 F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 F src/vdbeInt.h ffd68c4d4229227a5089bec53a1c635146177abc
 F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
-F src/vdbeaux.c 7564dc5c50fa28b748f10fa5e5c1e273bd5f5887
+F src/vdbeaux.c 77442ab4233858cf603910429033fbbd997ecdef
 F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
@@ -841,14 +841,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 56f11f8823cd06a69eebce6a9613e22b1810b59b
-R 34254bf6f8c3e90782d40aa93cfa271f
+P 8166f33885b86029bb8a0fbaf70606a0d2d5ec2e
+R 206ab46db8056d477c83ba4fb6c527f4
 U drh
-Z 053e423507811669e6a10059a2d5d2e9
+Z 33466832801b7ba31895995976b46d64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMTZRroxKgR168RlERAsS+AJ9MiRO/zfORO0eoZBt1tMKhCsUZ3wCggu8Q
-uWtBYTUhSwjacgrB9Ov6EPA=
-=QK5H
+iD8DBQFMTZmaoxKgR168RlERAn+pAJ4rC1olXw/iDp2XbDUFSLTSJSuc+wCfRE9f
+5SDUlQ0qZ1NrdW8jGONN1jQ=
+=xJpP
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 7dfd59978cab73aa1118a733072749c25b56ef51..0cee61f475b347df6ec604610321d0d8ed21d288 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8166f33885b86029bb8a0fbaf70606a0d2d5ec2e
\ No newline at end of file
+934cda2987c331b57a195ed45e9a91794896672a
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index a29307ff8ae73b3ca760535962bfde9b40277484..c7cd3e4284381f74cd7f49c963fe1cef8ef6c56d 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -610,7 +610,9 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
         if( db->pnBytesFreed==0 ){
           sqlite3ValueFree((sqlite3_value*)p4);
         }else{
-          sqlite3DbFree(db, ((Mem*)p4)->zMalloc);
+          Mem *p = (Mem*)p4;
+          sqlite3DbFree(db, p->zMalloc);
+          sqlite3DbFree(db, p);
         }
         break;
       }