Fossil SCM

Replace a few errant free() with fossil_free(). Free a tempfile buffer used by clearsign().

stephan 2026-11-01 07:43 UTC trunk
Commit 29ffb70a25e67811d534a33a8b62cb600b48fc1aaf0eca03519398f92bfb4a2e
1 file changed +4 -3
+4 -3
--- src/clearsign.c
+++ src/clearsign.c
@@ -47,11 +47,11 @@
4747
}else{
4848
zIn = mprintf("in-%z", zRand);
4949
zCmd = mprintf("%s %s %s", zBase, zIn, zOut);
5050
}
5151
rc = fossil_system(zCmd);
52
- free(zCmd);
52
+ fossil_free(zCmd);
5353
if( rc==0 ){
5454
if( pOut==pIn ){
5555
blob_reset(pIn);
5656
}
5757
blob_zero(pOut);
@@ -66,10 +66,11 @@
6666
blob_appendf(pOut, "%s", blob_str(&tmpBlob));
6767
blob_zero(&tmpBlob);
6868
blob_read_from_file(&tmpBlob, zIn, ExtFILE);
6969
/* Add signature - already armored by SSH */
7070
blob_appendb(pOut, &tmpBlob);
71
+ blob_reset(&tmpBlob);
7172
}else{
7273
/* Assume that the external command creates non-detached signatures */
7374
blob_read_from_file(pOut, zIn, ExtFILE);
7475
}
7576
}else{
@@ -77,9 +78,9 @@
7778
blob_copy(pOut, pIn);
7879
}
7980
}
8081
file_delete(zOut);
8182
file_delete(zIn);
82
- free(zOut);
83
- free(zIn);
83
+ fossil_free(zOut);
84
+ fossil_free(zIn);
8485
return rc;
8586
}
8687
--- 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

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button