Fossil SCM
For the test-comment-format command, also treat the original comment text argument as a file name when the --file option is specified. Fix memory leaks when the --file and --decode options are used together.
Commit
378dad36ba266cac134b135da6923432eb1725cc
Parent
0d0b80fd1cafff2…
1 file changed
+7
-2
+7
-2
| --- src/comformat.c | ||
| +++ src/comformat.c | ||
| @@ -453,16 +453,21 @@ | ||
| 453 | 453 | if( fromFile ){ |
| 454 | 454 | Blob fileData; |
| 455 | 455 | blob_read_from_file(&fileData, zText); |
| 456 | 456 | zText = mprintf("%s", blob_str(&fileData)); |
| 457 | 457 | blob_reset(&fileData); |
| 458 | + if( zOrigText ){ | |
| 459 | + blob_read_from_file(&fileData, zOrigText); | |
| 460 | + zOrigText = mprintf("%s", blob_str(&fileData)); | |
| 461 | + blob_reset(&fileData); | |
| 462 | + } | |
| 458 | 463 | } |
| 459 | 464 | if( decode ){ |
| 460 | - zText = mprintf("%s", zText); | |
| 465 | + zText = mprintf(fromFile ? "%z" : "%s", zText); | |
| 461 | 466 | defossilize(zText); |
| 462 | 467 | if( zOrigText ){ |
| 463 | - zOrigText = mprintf("%s", zOrigText); | |
| 468 | + zOrigText = mprintf(fromFile ? "%z" : "%s", zOrigText); | |
| 464 | 469 | defossilize(zOrigText); |
| 465 | 470 | } |
| 466 | 471 | } |
| 467 | 472 | indent = strlen(zPrefix); |
| 468 | 473 | if( indent>0 ){ |
| 469 | 474 |
| --- src/comformat.c | |
| +++ src/comformat.c | |
| @@ -453,16 +453,21 @@ | |
| 453 | if( fromFile ){ |
| 454 | Blob fileData; |
| 455 | blob_read_from_file(&fileData, zText); |
| 456 | zText = mprintf("%s", blob_str(&fileData)); |
| 457 | blob_reset(&fileData); |
| 458 | } |
| 459 | if( decode ){ |
| 460 | zText = mprintf("%s", zText); |
| 461 | defossilize(zText); |
| 462 | if( zOrigText ){ |
| 463 | zOrigText = mprintf("%s", zOrigText); |
| 464 | defossilize(zOrigText); |
| 465 | } |
| 466 | } |
| 467 | indent = strlen(zPrefix); |
| 468 | if( indent>0 ){ |
| 469 |
| --- src/comformat.c | |
| +++ src/comformat.c | |
| @@ -453,16 +453,21 @@ | |
| 453 | if( fromFile ){ |
| 454 | Blob fileData; |
| 455 | blob_read_from_file(&fileData, zText); |
| 456 | zText = mprintf("%s", blob_str(&fileData)); |
| 457 | blob_reset(&fileData); |
| 458 | if( zOrigText ){ |
| 459 | blob_read_from_file(&fileData, zOrigText); |
| 460 | zOrigText = mprintf("%s", blob_str(&fileData)); |
| 461 | blob_reset(&fileData); |
| 462 | } |
| 463 | } |
| 464 | if( decode ){ |
| 465 | zText = mprintf(fromFile ? "%z" : "%s", zText); |
| 466 | defossilize(zText); |
| 467 | if( zOrigText ){ |
| 468 | zOrigText = mprintf(fromFile ? "%z" : "%s", zOrigText); |
| 469 | defossilize(zOrigText); |
| 470 | } |
| 471 | } |
| 472 | indent = strlen(zPrefix); |
| 473 | if( indent>0 ){ |
| 474 |