Skip to content

Commit 502ab0f

Browse files
authored
r.kappa: Fix Resource Leak issues (#6224)
1 parent ae9bf4a commit 502ab0f

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

raster/r.kappa/mask.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ char *maskinfo(void)
2121

2222
results = NULL;
2323
if (!Rast_mask_status(mask_name, mask_mapset, NULL, NULL, NULL))
24-
return "none";
24+
return G_store("none");
2525
if (Rast_get_reclass(mask_name, mask_mapset, &reclass) <= 0) {
2626
snprintf(text, sizeof(text), "%s in %s", mask_name, mask_mapset);
2727
return append(results, text);

raster/r.kappa/print_header.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ void print_header(void)
2121
snprintf(buf, sizeof(buf), "LOCATION: %s\t\t\t\t%s", G_location(),
2222
G_date());
2323
fprintf(fd, "%s\n", buf);
24-
if ((mask = maskinfo()))
24+
if ((mask = maskinfo())) {
2525
snprintf(buf, sizeof(buf), "MASK: %s", mask);
26+
G_free(mask);
27+
}
2628

2729
fprintf(fd, "%s\n", buf);
2830
fprintf(fd, "MAPS: ");

raster/r.kappa/stats.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ int stats(void)
4646
argv[argc++] = "-cin";
4747

4848
argv[argc++] = "separator=:";
49+
char *f_mname = G_fully_qualified_name(mname, mmapset);
50+
char *f_rname = G_fully_qualified_name(rname, rmapset);
4951

50-
snprintf(buf, sizeof(buf), "input=%s,%s",
51-
G_fully_qualified_name(mname, mmapset),
52-
G_fully_qualified_name(rname, rmapset));
52+
snprintf(buf, sizeof(buf), "input=%s,%s", f_mname, f_rname);
53+
G_free(f_mname);
54+
G_free(f_rname);
5355
argv[argc++] = buf;
5456

5557
argv[argc++] = SF_REDIRECT_FILE;

0 commit comments

Comments
 (0)