Minor bug fix in NATSORT collating function.

FossilOrigin-Name: a61be1092732e4298e8b601c150555cb8c6ff79fec666f1889bfc71ddb6d35e9

diff --git a/manifest b/manifest
index 67a728d47a0c79880ddfb0dc5492ff30636c394b..3ec3b2670b7862985ea5460604dc4b01d711aa6e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sNATSORT\scollating\ssequence.\s\sNo\stest\scases\syet.
-D 2020-03-30T15:39:54.428
+C Minor\sbug\sfix\sin\sNATSORT\scollating\sfunction.
+D 2020-03-30T19:38:20.541
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c b179df50e6e8bb0c36c149e95d958d49bd8c6c7469e59c01b53d164360bc6c32
-F src/main.c 38e2f027c843ede6d0b2fb4fae4cd51b1146848ed2736c6461d6cd72a5b973a1
+F src/main.c ddaa99d6de6323a8f24c195f1fa4ff9fa2845744df122653df1af0f501c1a439
 F src/malloc.c cabfef0d725e04c8abfe0231a556ed8b78bf329dcc3fddbf903f6cdcd53cf4e6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1860,10 +1860,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a49f8ec552bede7da731e0571ccf49de1a30e7be3a5673150436c8b411ba6ffc
-R cdcaab153b3d333e9ee56a4e8fe64b19
-T *branch * natsort
-T *sym-natsort *
-T -sym-trunk *
+P 79fcaa8e07f61ea84e24f7e30d2426a7d30bfe6316d5a89e5662b03b0c8943f3
+R e448dec24a214320172f787a96e91122
 U drh
-Z 52cc0ba312367dbd46a4cc87640d9522
+Z 982925efe7000efed9889a0f000d8bb6

diff --git a/manifest.uuid b/manifest.uuid
index 528f3bd36bab5db904f216edab9f2ffd14839943..38c8f231d8144d3f9144228976074b7a017b34de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79fcaa8e07f61ea84e24f7e30d2426a7d30bfe6316d5a89e5662b03b0c8943f3
\ No newline at end of file
+a61be1092732e4298e8b601c150555cb8c6ff79fec666f1889bfc71ddb6d35e9
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index e042e05c9e05979ed07efa91c79aebae77fcb796..037ef966938be7056ccc37177bcfde929747ffdd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1008,8 +1008,8 @@ static int natsortCollFunc(
     if( sqlite3Isdigit(zA[i]) ){
       int k;
       if( !sqlite3Isdigit(zB[j]) ) return x;
-      while( zA[i]=='0' && i<nKey1 ){ i++; }
-      while( zB[j]=='0' && j<nKey2 ){ j++; }
+      while( i<nKey1 && zA[i]=='0' ){ i++; }
+      while( j<nKey2 && zB[j]=='0' ){ j++; }
       k = 0;
       while( i+k<nKey1 && sqlite3Isdigit(zA[i+k])
              && j+k<nKey2 && sqlite3Isdigit(zB[j+k]) ){