IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[gnc-plugin-page-report.cpp] plug GHashTable leak; use unordered_map

Browse Source
This commit is contained in:
Christopher Lam 2023-07-01 22:03:30 +08:00
parent 9dfe223fc7
commit c44d4b6b79
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnucash/gnome/gnc-plugin-page-report.cpp
View File

@ -85,10 +85,9 @@ with qof_log_set_level().*/
static QofLogModule log_module = GNC_MOD_GUI; static QofLogModule log_module = GNC_MOD_GUI;
// A static GHashTable to record the usage count for each printer // A static GHashTable to record the usage count for each printer
// output name. FIXME: Currently this isn't cleaned up at program // output name.
// shutdown because there isn't a place to easily insert a finalize()
// function for this. Oh well. static std::unordered_map<std::string,unsigned> static_report_printnames;
static GHashTable *static_report_printnames = nullptr;
// Property-id values. // Property-id values.
enum enum
@ -366,11 +365,6 @@ gnc_plugin_page_report_class_init (GncPluginPageReportClass *klass)
_("The numeric ID of the report."), _("The numeric ID of the report."),
-1, G_MAXINT, -1, -1, G_MAXINT, -1,
paramspec)); paramspec));
// Also initialize the report name usage count table
if (!static_report_printnames)
static_report_printnames = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, nullptr);
} }
static void static void
@ -1947,32 +1941,16 @@ static gchar *report_create_jobname(GncPluginPageReportPrivate *priv)
{ {
/* And one final checking issue: We want to avoid allocating /* And one final checking issue: We want to avoid allocating
* the same name twice for a saved PDF. Hence, we keep a * the same name twice for a saved PDF. Hence, we keep a
* GHashTable with the usage count of existing output * unordered_map with the usage count of existing output
* names. (Because I'm lazy, I just use a static GHashTable * names. */
* for this.) */
gpointer value;
gboolean already_found;
g_assert(static_report_printnames);
// Lookup the existing usage count auto& value = static_report_printnames[job_name];
value = g_hash_table_lookup(static_report_printnames, job_name); value++;
already_found = (value != nullptr);
if (!value)
{
value = GINT_TO_POINTER(0);
}
// Increment the stored usage count if (value > 1)
value = GINT_TO_POINTER(1 + GPOINTER_TO_INT(value));
// and store it again
g_hash_table_insert(static_report_printnames, g_strdup(job_name), value);
// If the previous usage count was more than 0, append the current
// count (which is now 2 or higher) to the resulting name
if (already_found)
{ {
// The name was already in use, so modify the name again // The name was already in use, so modify the name again
gchar *tmp = g_strdup_printf("%s_%d", job_name, (int) GPOINTER_TO_INT(value)); gchar *tmp = g_strdup_printf("%s_%d", job_name, value);
g_free(job_name); g_free(job_name);
job_name = tmp; job_name = tmp;
} }