Fix CLI use of wrong allocator for free().

FossilOrigin-Name: 4f83c442c9b34abc292566b9547d3bd265e7a5e9662472fd6498faa22aafdd24

diff --git a/manifest b/manifest
index 419c65855a06c0290e079a3e657e9d98ee93de62..0130fcd62ba2af1b2c7360aad17deba86aa2fc51 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smulti-byte\scolumn\sname\srendition\son\s.import\sand\sdisplay\sof\sNULL\sin\scolumnar\smodes.
-D 2022-05-03T19:51:22.532
+C Fix\sCLI\suse\sof\swrong\sallocator\sfor\sfree().
+D 2022-05-04T03:48:07.925
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -553,7 +553,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c ba0cd3d264fa788c8d65f063d5ec3e1d65b0dac206c822a564a59ba550210cfc
-F src/shell.c.in e2bc31eca23a1d1d2aaea02dcfde6dfe0ee96bdfa6cbcc36c79f02e457bef18c
+F src/shell.c.in 1060fa0c4d585fb40f3473d7175c05ea81b0909a304de7216ae7b97bf0e5845f
 F src/sqlite.h.in b93deee892f1bc4030e5c8712df9e21d786a1bf8e921ab8dc987eaf1e44c676f
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
@@ -1944,11 +1944,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P def971a0e90212a2387967d4a4b266a7c39129ad66fb7df7bf11f6979d1e524a
-Q +21e96600d90c1cda84777abe22a11058eba46c9faefeb05f8c31bc0e7fa84b19
-Q +77aed89192bdbad819ac17bf5d08728278a9b8cbbbef1d805df230caff79b417
-Q +dfd2100bc4f316825fd199b347849d1a2b941837f9eedcf36f3c3d280692b991
-R bc7c810360b7b2c9fe8a3f83de0daf96
+P f863aabe9da11b9d424362543536c929f34a0f632ba973c278d4cd56e21960fa
+Q +9fb20a21feb8f6979812f45691e06aa3e297d7370cf0d5820523e817a4e97863
+R cfa691fad1c1b13c897954002fcae77c
 U larrybr
-Z 8e27acbdaff1028d4e6e2d1634565657
+Z c4c712370dd63f187d9bf836f5bba85e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c764644f2cd5ccb83e7ae0fa1d84895a8c8a3f0a..cc7292c9156974561a82c74a5d77cdeb903cb49f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f863aabe9da11b9d424362543536c929f34a0f632ba973c278d4cd56e21960fa
\ No newline at end of file
+4f83c442c9b34abc292566b9547d3bd265e7a5e9662472fd6498faa22aafdd24
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 9626c46627b7400e27041a0cb23b3893789b2d56..94b314345f21b4cdeab8ad1d311ad6e5a4dcefd6 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3536,7 +3536,7 @@ columnar_end:
   nData = (nRow+1)*nColumn;
   for(i=0; i<nData; i++){
     z = azData[i];
-    if( z!=zEmpty && z!=zShowNull ) free(azData[i]);
+    if( z!=zEmpty && z!=zShowNull ) sqlite3_free(azData[i]);
   }
   sqlite3_free(azData);
   sqlite3_free((void*)azNextLine);