Fossil SCM
Fix a bug in the manifest parser so that it is able to parse the PGP headers even if the header contains \r characters.
Commit
3ed92143382f3dd9707a73764b412efe1a32b0cb
Parent
b5d82ebd7e25ee6…
1 file changed
+1
-1
+1
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | db_bind_int(&ins, ":vid", vid); |
| 99 | 99 | while( blob_line(p, &line) ){ |
| 100 | 100 | char *z = blob_buffer(&line); |
| 101 | 101 | if( z[0]=='-' ){ |
| 102 | 102 | if( seenHeader ) break; |
| 103 | - while( blob_line(p, &line)>1 ){} | |
| 103 | + while( blob_line(p, &line)>2 ){} | |
| 104 | 104 | if( blob_line(p, &line)==0 ) break; |
| 105 | 105 | } |
| 106 | 106 | seenHeader = 1; |
| 107 | 107 | if( z[0]!='F' || z[1]!=' ' ) continue; |
| 108 | 108 | blob_token(&line, &token); /* Skip the "F" token */ |
| 109 | 109 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -98,11 +98,11 @@ | |
| 98 | db_bind_int(&ins, ":vid", vid); |
| 99 | while( blob_line(p, &line) ){ |
| 100 | char *z = blob_buffer(&line); |
| 101 | if( z[0]=='-' ){ |
| 102 | if( seenHeader ) break; |
| 103 | while( blob_line(p, &line)>1 ){} |
| 104 | if( blob_line(p, &line)==0 ) break; |
| 105 | } |
| 106 | seenHeader = 1; |
| 107 | if( z[0]!='F' || z[1]!=' ' ) continue; |
| 108 | blob_token(&line, &token); /* Skip the "F" token */ |
| 109 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -98,11 +98,11 @@ | |
| 98 | db_bind_int(&ins, ":vid", vid); |
| 99 | while( blob_line(p, &line) ){ |
| 100 | char *z = blob_buffer(&line); |
| 101 | if( z[0]=='-' ){ |
| 102 | if( seenHeader ) break; |
| 103 | while( blob_line(p, &line)>2 ){} |
| 104 | if( blob_line(p, &line)==0 ) break; |
| 105 | } |
| 106 | seenHeader = 1; |
| 107 | if( z[0]!='F' || z[1]!=' ' ) continue; |
| 108 | blob_token(&line, &token); /* Skip the "F" token */ |
| 109 |