Fossil SCM
rebase
Commit
ab4e8638bf6a8be5e4df5caacd22442789566912
Parent
9f931a7569268c4…
1 file changed
-3
-3
| --- src/file.c | ||
| +++ src/file.c | ||
| @@ -487,11 +487,10 @@ | ||
| 487 | 487 | ** a file in a repository. Valid filenames follow all of the |
| 488 | 488 | ** following rules: |
| 489 | 489 | ** |
| 490 | 490 | ** * Does not begin with "/" |
| 491 | 491 | ** * Does not contain any path element named "." or ".." |
| 492 | -** * Does not contain any of these characters in the path: "\" | |
| 493 | 492 | ** * Does not end with "/". |
| 494 | 493 | ** * Does not contain two or more "/" characters in a row. |
| 495 | 494 | ** * Contains at least one character |
| 496 | 495 | ** |
| 497 | 496 | ** Invalid UTF8 characters result in a false return if bStrictUtf8 is |
| @@ -551,12 +550,10 @@ | ||
| 551 | 550 | if( (z[++i]&0xc0)!=0x80 ){ |
| 552 | 551 | /* Invalid second continuation byte */ |
| 553 | 552 | return 0; |
| 554 | 553 | } |
| 555 | 554 | } |
| 556 | - }else if( bStrictUtf8 && (c=='\\') ){ | |
| 557 | - return 0; | |
| 558 | 555 | } |
| 559 | 556 | if( c=='/' ){ |
| 560 | 557 | if( z[i+1]=='/' ) return 0; |
| 561 | 558 | if( z[i+1]=='.' ){ |
| 562 | 559 | if( z[i+2]=='/' || z[i+2]==0 ) return 0; |
| 563 | 560 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -487,11 +487,10 @@ | |
| 487 | ** a file in a repository. Valid filenames follow all of the |
| 488 | ** following rules: |
| 489 | ** |
| 490 | ** * Does not begin with "/" |
| 491 | ** * Does not contain any path element named "." or ".." |
| 492 | ** * Does not contain any of these characters in the path: "\" |
| 493 | ** * Does not end with "/". |
| 494 | ** * Does not contain two or more "/" characters in a row. |
| 495 | ** * Contains at least one character |
| 496 | ** |
| 497 | ** Invalid UTF8 characters result in a false return if bStrictUtf8 is |
| @@ -551,12 +550,10 @@ | |
| 551 | if( (z[++i]&0xc0)!=0x80 ){ |
| 552 | /* Invalid second continuation byte */ |
| 553 | return 0; |
| 554 | } |
| 555 | } |
| 556 | }else if( bStrictUtf8 && (c=='\\') ){ |
| 557 | return 0; |
| 558 | } |
| 559 | if( c=='/' ){ |
| 560 | if( z[i+1]=='/' ) return 0; |
| 561 | if( z[i+1]=='.' ){ |
| 562 | if( z[i+2]=='/' || z[i+2]==0 ) return 0; |
| 563 |
| --- src/file.c | |
| +++ src/file.c | |
| @@ -487,11 +487,10 @@ | |
| 487 | ** a file in a repository. Valid filenames follow all of the |
| 488 | ** following rules: |
| 489 | ** |
| 490 | ** * Does not begin with "/" |
| 491 | ** * Does not contain any path element named "." or ".." |
| 492 | ** * Does not end with "/". |
| 493 | ** * Does not contain two or more "/" characters in a row. |
| 494 | ** * Contains at least one character |
| 495 | ** |
| 496 | ** Invalid UTF8 characters result in a false return if bStrictUtf8 is |
| @@ -551,12 +550,10 @@ | |
| 550 | if( (z[++i]&0xc0)!=0x80 ){ |
| 551 | /* Invalid second continuation byte */ |
| 552 | return 0; |
| 553 | } |
| 554 | } |
| 555 | } |
| 556 | if( c=='/' ){ |
| 557 | if( z[i+1]=='/' ) return 0; |
| 558 | if( z[i+1]=='.' ){ |
| 559 | if( z[i+2]=='/' || z[i+2]==0 ) return 0; |
| 560 |