From: larrybr <larrybr@noemail.net>
Date: Fri, 12 May 2023 14:51:00 +0000 (+0000)
Subject: Fix unlikely strange result of CLI edit().
X-Git-Tag: version-3.42.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb74019a143dae9d20ba408ac8da74818cea6776;p=thirdparty%2Fsqlite.git

Fix unlikely strange result of CLI edit().

FossilOrigin-Name: ab3797e844c97fed344b36f30cfb788aca9e0d68c574fb833712219eb712db44
---

diff --git a/manifest b/manifest
index be8887dde6..4d51e52390 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthe\s_O_U16TEXT\sis\sdefined\sfor\sWindows\sbuilds\sof\sthe\sCLI.\n[forum:/forumpost/c80aa942dc6bf2|Forum\spost\sc80aa942dc6bf2].
-D 2023-05-12T13:20:57.273
+C Fix\sunlikely\sstrange\sresult\sof\sCLI\sedit().
+D 2023-05-12T14:51:00.610
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 12aa3168be4ff175702fe0ebeaf544312be22d275d378a28e7b2fad32d552d36
-F src/shell.c.in f2878df634b9d13ef7944f0d2d516d0b1abaf69302c26b4a8f1878b8be9f8411
+F src/shell.c.in 1e18312f58d365042036fc9d19dcef416074f783702b168f07814332c2268ee0
 F src/sqlite.h.in 27ca1d4b2eda8feee468af5735182390e8fe4696522751eec0136d17323201ad
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2068,8 +2068,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 48139fb904de4b7b383e7f8c29bed83ad878eb22b1dd773c366a0aee74613d23
-R 48448dc19b809c692b0d7c49b41acf2c
-U drh
-Z 99702f4eff9217b484a47a30f0a1c45c
+P 504effa89b48c0dc6cd12b3eaf6017be3f32017c601af17759a3cc185346d868
+R 7b322be7a0b0968d044fb9694e50e6d3
+U larrybr
+Z be57394b3dc65bf45231fa83c98fd2dc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6425bb986f..5073c7a014 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-504effa89b48c0dc6cd12b3eaf6017be3f32017c601af17759a3cc185346d868
\ No newline at end of file
+ab3797e844c97fed344b36f30cfb788aca9e0d68c574fb833712219eb712db44
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index b29e402913..ccaed896d9 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1776,6 +1776,7 @@ static void editFunc(
     }else{
       /* If the file did not originally contain \r\n then convert any new
       ** \r\n back into \n */
+      p[sz] = 0;
       for(i=j=0; i<sz; i++){
         if( p[i]=='\r' && p[i+1]=='\n' ) i++;
         p[j++] = p[i];