Fossil SCM

Fix to the uintnocase collating sequence. See [forum:/forumpost/56250e7ff0|forum post 56250e7ff0].

drh 2022-03-12 20:11 trunk
Commit b39475b6253408c09f8af09e8517ac7c47f71e8c646d4916c47d7ed8cd5f615d
1 file changed +1 -2
+1 -2
--- src/db.c
+++ src/db.c
@@ -1395,13 +1395,12 @@
13951395
const unsigned char *zA = (const unsigned char*)pKey1;
13961396
const unsigned char *zB = (const unsigned char*)pKey2;
13971397
int i=0, j=0, x;
13981398
(void)notUsed;
13991399
while( i<nKey1 && j<nKey2 ){
1400
- if( fossil_isdigit(zA[i]) ){
1400
+ if( fossil_isdigit(zA[i]) && fossil_isdigit(zB[j]) ){
14011401
int k;
1402
- if( !fossil_isdigit(zB[j]) ) return x;
14031402
while( i<nKey1 && zA[i]=='0' ){ i++; }
14041403
while( j<nKey2 && zB[j]=='0' ){ j++; }
14051404
k = 0;
14061405
while( i+k<nKey1 && fossil_isdigit(zA[i+k])
14071406
&& j+k<nKey2 && fossil_isdigit(zB[j+k]) ){
14081407
--- src/db.c
+++ src/db.c
@@ -1395,13 +1395,12 @@
1395 const unsigned char *zA = (const unsigned char*)pKey1;
1396 const unsigned char *zB = (const unsigned char*)pKey2;
1397 int i=0, j=0, x;
1398 (void)notUsed;
1399 while( i<nKey1 && j<nKey2 ){
1400 if( fossil_isdigit(zA[i]) ){
1401 int k;
1402 if( !fossil_isdigit(zB[j]) ) return x;
1403 while( i<nKey1 && zA[i]=='0' ){ i++; }
1404 while( j<nKey2 && zB[j]=='0' ){ j++; }
1405 k = 0;
1406 while( i+k<nKey1 && fossil_isdigit(zA[i+k])
1407 && j+k<nKey2 && fossil_isdigit(zB[j+k]) ){
1408
--- src/db.c
+++ src/db.c
@@ -1395,13 +1395,12 @@
1395 const unsigned char *zA = (const unsigned char*)pKey1;
1396 const unsigned char *zB = (const unsigned char*)pKey2;
1397 int i=0, j=0, x;
1398 (void)notUsed;
1399 while( i<nKey1 && j<nKey2 ){
1400 if( fossil_isdigit(zA[i]) && fossil_isdigit(zB[j]) ){
1401 int k;
 
1402 while( i<nKey1 && zA[i]=='0' ){ i++; }
1403 while( j<nKey2 && zB[j]=='0' ){ j++; }
1404 k = 0;
1405 while( i+k<nKey1 && fossil_isdigit(zA[i+k])
1406 && j+k<nKey2 && fossil_isdigit(zB[j+k]) ){
1407

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button