Fossil SCM
Replace a few errant free() with fossil_free(). Free a tempfile buffer used by clearsign().
Commit
29ffb70a25e67811d534a33a8b62cb600b48fc1aaf0eca03519398f92bfb4a2e
Parent
8bdb8bc4ccc21fc…
1 file changed
+4
-3
+4
-3
| --- src/clearsign.c | ||
| +++ src/clearsign.c | ||
| @@ -47,11 +47,11 @@ | ||
| 47 | 47 | }else{ |
| 48 | 48 | zIn = mprintf("in-%z", zRand); |
| 49 | 49 | zCmd = mprintf("%s %s %s", zBase, zIn, zOut); |
| 50 | 50 | } |
| 51 | 51 | rc = fossil_system(zCmd); |
| 52 | - free(zCmd); | |
| 52 | + fossil_free(zCmd); | |
| 53 | 53 | if( rc==0 ){ |
| 54 | 54 | if( pOut==pIn ){ |
| 55 | 55 | blob_reset(pIn); |
| 56 | 56 | } |
| 57 | 57 | blob_zero(pOut); |
| @@ -66,10 +66,11 @@ | ||
| 66 | 66 | blob_appendf(pOut, "%s", blob_str(&tmpBlob)); |
| 67 | 67 | blob_zero(&tmpBlob); |
| 68 | 68 | blob_read_from_file(&tmpBlob, zIn, ExtFILE); |
| 69 | 69 | /* Add signature - already armored by SSH */ |
| 70 | 70 | blob_appendb(pOut, &tmpBlob); |
| 71 | + blob_reset(&tmpBlob); | |
| 71 | 72 | }else{ |
| 72 | 73 | /* Assume that the external command creates non-detached signatures */ |
| 73 | 74 | blob_read_from_file(pOut, zIn, ExtFILE); |
| 74 | 75 | } |
| 75 | 76 | }else{ |
| @@ -77,9 +78,9 @@ | ||
| 77 | 78 | blob_copy(pOut, pIn); |
| 78 | 79 | } |
| 79 | 80 | } |
| 80 | 81 | file_delete(zOut); |
| 81 | 82 | file_delete(zIn); |
| 82 | - free(zOut); | |
| 83 | - free(zIn); | |
| 83 | + fossil_free(zOut); | |
| 84 | + fossil_free(zIn); | |
| 84 | 85 | return rc; |
| 85 | 86 | } |
| 86 | 87 |
| --- src/clearsign.c | |
| +++ src/clearsign.c | |
| @@ -47,11 +47,11 @@ | |
| 47 | }else{ |
| 48 | zIn = mprintf("in-%z", zRand); |
| 49 | zCmd = mprintf("%s %s %s", zBase, zIn, zOut); |
| 50 | } |
| 51 | rc = fossil_system(zCmd); |
| 52 | free(zCmd); |
| 53 | if( rc==0 ){ |
| 54 | if( pOut==pIn ){ |
| 55 | blob_reset(pIn); |
| 56 | } |
| 57 | blob_zero(pOut); |
| @@ -66,10 +66,11 @@ | |
| 66 | blob_appendf(pOut, "%s", blob_str(&tmpBlob)); |
| 67 | blob_zero(&tmpBlob); |
| 68 | blob_read_from_file(&tmpBlob, zIn, ExtFILE); |
| 69 | /* Add signature - already armored by SSH */ |
| 70 | blob_appendb(pOut, &tmpBlob); |
| 71 | }else{ |
| 72 | /* Assume that the external command creates non-detached signatures */ |
| 73 | blob_read_from_file(pOut, zIn, ExtFILE); |
| 74 | } |
| 75 | }else{ |
| @@ -77,9 +78,9 @@ | |
| 77 | blob_copy(pOut, pIn); |
| 78 | } |
| 79 | } |
| 80 | file_delete(zOut); |
| 81 | file_delete(zIn); |
| 82 | free(zOut); |
| 83 | free(zIn); |
| 84 | return rc; |
| 85 | } |
| 86 |
| --- src/clearsign.c | |
| +++ src/clearsign.c | |
| @@ -47,11 +47,11 @@ | |
| 47 | }else{ |
| 48 | zIn = mprintf("in-%z", zRand); |
| 49 | zCmd = mprintf("%s %s %s", zBase, zIn, zOut); |
| 50 | } |
| 51 | rc = fossil_system(zCmd); |
| 52 | fossil_free(zCmd); |
| 53 | if( rc==0 ){ |
| 54 | if( pOut==pIn ){ |
| 55 | blob_reset(pIn); |
| 56 | } |
| 57 | blob_zero(pOut); |
| @@ -66,10 +66,11 @@ | |
| 66 | blob_appendf(pOut, "%s", blob_str(&tmpBlob)); |
| 67 | blob_zero(&tmpBlob); |
| 68 | blob_read_from_file(&tmpBlob, zIn, ExtFILE); |
| 69 | /* Add signature - already armored by SSH */ |
| 70 | blob_appendb(pOut, &tmpBlob); |
| 71 | blob_reset(&tmpBlob); |
| 72 | }else{ |
| 73 | /* Assume that the external command creates non-detached signatures */ |
| 74 | blob_read_from_file(pOut, zIn, ExtFILE); |
| 75 | } |
| 76 | }else{ |
| @@ -77,9 +78,9 @@ | |
| 78 | blob_copy(pOut, pIn); |
| 79 | } |
| 80 | } |
| 81 | file_delete(zOut); |
| 82 | file_delete(zIn); |
| 83 | fossil_free(zOut); |
| 84 | fossil_free(zIn); |
| 85 | return rc; |
| 86 | } |
| 87 |