Skip to content

Change: free report printing context using a function #2669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
greenbonebot merged 2 commits into from
Dec 18, 2025
Merged

Change: free report printing context using a function #2669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a592c04
Change: free report printing context using a function
mattmundell Dec 9, 2025
8ae0b73
Merge branch 'main' into smaller-print-report-7
mattmundell Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16759,9 +16759,6 @@ tz_revert (gchar *zone, char *tz, char *old_tz_override)
if (setenv ("TZ", tz, 1) == -1)
{
g_warning ("%s: Failed to switch to original TZ", __func__);
g_free (tz);
g_free (zone);
free (old_tz_override);
return -1;
}
}
Expand All @@ -16772,11 +16769,7 @@ tz_revert (gchar *zone, char *tz, char *old_tz_override)
sql ("SET SESSION \"gvmd.tz_override\" = %s;",
quoted_old_tz_override);
g_free (quoted_old_tz_override);

free (old_tz_override);
g_free (tz);
}
g_free (zone);
return 0;
}

Expand Down Expand Up @@ -17533,6 +17526,19 @@ struct print_report_context
*/
typedef struct print_report_context print_report_context_t;

/**
* @brief Free the members of a context.
*
* @param[in] ctx Printing context.
*/
static void
print_report_context_cleanup (print_report_context_t *ctx)
{
g_free (ctx->tz);
g_free (ctx->zone);
free (ctx->old_tz_override);
}

/**
* @brief Init zone info for print_report_xml_start.
*
Expand Down Expand Up @@ -18872,6 +18878,8 @@ print_report_xml_start (report_t report, report_t delta, task_t task,
if (host_summary && host_summary_buffer)
*host_summary = g_string_free (host_summary_buffer, FALSE);

print_report_context_cleanup (&ctx);

if (fclose (out))
{
g_warning ("%s: fclose failed: %s",
Expand Down Expand Up @@ -18914,6 +18922,7 @@ print_report_xml_start (report_t report, report_t delta, task_t task,
}
fail:
tz_revert (ctx.zone, ctx.tz, ctx.old_tz_override);
print_report_context_cleanup (&ctx);
fclose (out);
return -1;
}
Expand Down
Loading