Fossil SCM
And this time compile before committing.
Commit
a62ffc192289b90e1a08ff676c283f1f4df667cf46536e6caac23ccf365b6555
Parent
cfddded40e91f9c…
2 files changed
+1
-1
+2
+1
-1
| --- src/http.c | ||
| +++ src/http.c | ||
| @@ -636,11 +636,11 @@ | ||
| 636 | 636 | }else if( fossil_strnicmp(&zLine[14], "application/x-fossil", -1)!=0 ){ |
| 637 | 637 | isError = 1; |
| 638 | 638 | } |
| 639 | 639 | } |
| 640 | 640 | }else if( fossil_strnicmp(zLine, "x-fossil-xfer-login: ", 21)==0 ){ |
| 641 | - g.zLoginCard = fsl_mprintf("%s", &line[21]); | |
| 641 | + g.zLoginCard = mprintf("%s", &zLine[21]); | |
| 642 | 642 | } |
| 643 | 643 | } |
| 644 | 644 | if( iHttpVersion<0 ){ |
| 645 | 645 | /* We got nothing back from the server. If using the ssh: protocol, |
| 646 | 646 | ** this might mean we need to add or remove the PATH=... argument |
| 647 | 647 |
| --- src/http.c | |
| +++ src/http.c | |
| @@ -636,11 +636,11 @@ | |
| 636 | }else if( fossil_strnicmp(&zLine[14], "application/x-fossil", -1)!=0 ){ |
| 637 | isError = 1; |
| 638 | } |
| 639 | } |
| 640 | }else if( fossil_strnicmp(zLine, "x-fossil-xfer-login: ", 21)==0 ){ |
| 641 | g.zLoginCard = fsl_mprintf("%s", &line[21]); |
| 642 | } |
| 643 | } |
| 644 | if( iHttpVersion<0 ){ |
| 645 | /* We got nothing back from the server. If using the ssh: protocol, |
| 646 | ** this might mean we need to add or remove the PATH=... argument |
| 647 |
| --- src/http.c | |
| +++ src/http.c | |
| @@ -636,11 +636,11 @@ | |
| 636 | }else if( fossil_strnicmp(&zLine[14], "application/x-fossil", -1)!=0 ){ |
| 637 | isError = 1; |
| 638 | } |
| 639 | } |
| 640 | }else if( fossil_strnicmp(zLine, "x-fossil-xfer-login: ", 21)==0 ){ |
| 641 | g.zLoginCard = mprintf("%s", &zLine[21]); |
| 642 | } |
| 643 | } |
| 644 | if( iHttpVersion<0 ){ |
| 645 | /* We got nothing back from the server. If using the ssh: protocol, |
| 646 | ** this might mean we need to add or remove the PATH=... argument |
| 647 |
+2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1324,10 +1324,12 @@ | ||
| 1324 | 1324 | count(xfer.aToken)); |
| 1325 | 1325 | if( xfer.nToken==4 |
| 1326 | 1326 | && blob_eq(&xfer.aToken[0], "login") ){ |
| 1327 | 1327 | goto handle_login_card; |
| 1328 | 1328 | } |
| 1329 | + fossil_free( g.zLoginCard ); | |
| 1330 | + g.zLoginCard = 0; | |
| 1329 | 1331 | } |
| 1330 | 1332 | while( blob_line(xfer.pIn, &xfer.line) ){ |
| 1331 | 1333 | if( blob_buffer(&xfer.line)[0]=='#' ) continue; |
| 1332 | 1334 | if( blob_size(&xfer.line)==0 ) continue; |
| 1333 | 1335 | xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken)); |
| 1334 | 1336 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1324,10 +1324,12 @@ | |
| 1324 | count(xfer.aToken)); |
| 1325 | if( xfer.nToken==4 |
| 1326 | && blob_eq(&xfer.aToken[0], "login") ){ |
| 1327 | goto handle_login_card; |
| 1328 | } |
| 1329 | } |
| 1330 | while( blob_line(xfer.pIn, &xfer.line) ){ |
| 1331 | if( blob_buffer(&xfer.line)[0]=='#' ) continue; |
| 1332 | if( blob_size(&xfer.line)==0 ) continue; |
| 1333 | xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken)); |
| 1334 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1324,10 +1324,12 @@ | |
| 1324 | count(xfer.aToken)); |
| 1325 | if( xfer.nToken==4 |
| 1326 | && blob_eq(&xfer.aToken[0], "login") ){ |
| 1327 | goto handle_login_card; |
| 1328 | } |
| 1329 | fossil_free( g.zLoginCard ); |
| 1330 | g.zLoginCard = 0; |
| 1331 | } |
| 1332 | while( blob_line(xfer.pIn, &xfer.line) ){ |
| 1333 | if( blob_buffer(&xfer.line)[0]=='#' ) continue; |
| 1334 | if( blob_size(&xfer.line)==0 ) continue; |
| 1335 | xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken)); |
| 1336 |