From: drh <drh@noemail.net>
Date: Thu, 23 Jul 2020 18:03:14 +0000 (+0000)
Subject: Add the OMIT_ZLIB compile-time option to sessionfuzz.c.  (Originally
X-Git-Tag: version-3.33.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38f0ccc070d50ff693f62ee9dc8e508db18a62c4;p=thirdparty%2Fsqlite.git

Add the OMIT_ZLIB compile-time option to sessionfuzz.c.  (Originally
checked into the wrong branch.)

FossilOrigin-Name: 6019bf8a2db548fea4be4f49961937d5b12eba9e42c7c7a58babfaf3288cb0cd
---

diff --git a/manifest b/manifest
index ed9f040748..a344b052d6 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C An\sORDER\sBY\sclause\scan\sslip\sinto\san\sSRT_Upfrom\squery\svia\sthe\squery\nflattener,\seven\swithout\sthe\sSQLITE_ENABLE_UPDATE_DELETE_LIMIT\scompile-time\noption.\s\sSo\salways\senable\sthe\scode\sto\sdeal\swith\sthat\scase.
-D 2020-07-23T14:12:47.461
+C Add\sthe\sOMIT_ZLIB\scompile-time\soption\sto\ssessionfuzz.c.\s\s(Originally\nchecked\sinto\sthe\swrong\sbranch.)
+D 2020-07-23T18:03:14.533
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -56,6 +56,7 @@ F test/gencol1.test b05e6c5edb9b10d48efb634ed07342441bddc89d225043e17095c36e5675
 F test/ieee754.test b0945d12be7d255f3dfa18e2511b17ca37e0edd2b803231c52d05b86c04ab26e
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 50b91bedea9324d3ab48e793f908ee7d2c7dcf84bfa2281e792838be59641ec8
+F test/sessionfuzz.c f74c4e806bab5a093fb9c11b6123d17a6e0cf73fb7a0f49b12f5a75bf0b7b1a8
 F test/speedtest1.c a8b5afe72d78ff365012aba48d3f0c579e957facb7630f765f58a6ae4656d20d
 F test/tester.tcl 174f668fcb4569a775bf24534ac8e59ce47d3a56d37c3465d1857f027e7ec136
 F test/triggerupfrom.test d25961fa70a99b6736193da7b49a36d8c1d28d56188f0be6406d4366315cd6e4
@@ -73,7 +74,8 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 28515bbbae4fbc260457dea7a0f7414be1837d6db27fec5514f8da358bfc1f0c
-R 796f4eb68aea986a8f73e6e51252aacd
+P 6a3111cd0693bb51191d55a32ecd436341638d54ecb2df0778de681b4969241b
+Q +0785e3146e40b898c470221e69f494664323801ac1b9b11e80f8f635ef51cbf9
+R a6bd871bcc7295284d3a187bbb119185
 U drh
-Z c1de31883a1f8f457abd5c3040dd5d2f
+Z 55024f57a03c5724e1bb3b1dccbca04d
diff --git a/manifest.uuid b/manifest.uuid
index 44b233273c..7047765f4a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a3111cd0693bb51191d55a32ecd436341638d54ecb2df0778de681b4969241b
\ No newline at end of file
+6019bf8a2db548fea4be4f49961937d5b12eba9e42c7c7a58babfaf3288cb0cd
\ No newline at end of file
diff --git a/test/sessionfuzz.c b/test/sessionfuzz.c
index 1d0bee436c..d8cc1bebfb 100644
--- a/test/sessionfuzz.c
+++ b/test/sessionfuzz.c
@@ -698,7 +698,9 @@ static const char zHelp[] =
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#ifndef OMIT_ZLIB
 #include "zlib.h"
+#endif
 
 /*
 ** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
@@ -715,6 +717,9 @@ static void sqlarUncompressFunc(
   int argc,
   sqlite3_value **argv
 ){
+#ifdef OMIT_ZLIB
+  sqlite3_result_value(context, argv[0]);
+#else
   uLong nData;
   uLongf sz;
 
@@ -733,6 +738,7 @@ static void sqlarUncompressFunc(
     }
     sqlite3_free(pOut);
   }
+#endif
 }