HGKeeper

pidgin/pidgin

Fix leaks in purple markup

14 months ago, Elliott Sales de Andrade

a39305511805

Fix leaks in purple markup

Fix leaks when running the markup tests. These are all from leaking `tags`:
```
24 bytes in 1 blocks are definitely lost in loss record 101 of 251
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48E563C: purple_markup_html_to_xhtml (purplemarkup.c:437)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401575: main (test_markup.c:281)

24 bytes in 1 blocks are definitely lost in loss record 102 of 251
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48E0319: purple_markup_html_to_xhtml (purplemarkup.c:260)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401575: main (test_markup.c:281)

24 bytes in 1 blocks are definitely lost in loss record 103 of 251
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48E07B7: purple_markup_html_to_xhtml (purplemarkup.c:261)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401575: main (test_markup.c:281)

24 bytes in 1 blocks are definitely lost in loss record 104 of 251
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48E0C55: purple_markup_html_to_xhtml (purplemarkup.c:262)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401575: main (test_markup.c:281)

24 bytes in 1 blocks are definitely lost in loss record 105 of 251
at 0x4848464: calloc (vg_replace_malloc.c:1340)
by 0x49F75F0: g_malloc0 (gmem.c:163)
by 0x48E10F3: purple_markup_html_to_xhtml (purplemarkup.c:263)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
by 0x4A156EC: UnknownInlinedFun (gtestutils.c:2234)
by 0x4A156EC: g_test_run (gtestutils.c:2221)
by 0x401575: main (test_markup.c:281)
```
and these from not freeing the result from `purple_unescape_html`:
```
256 bytes in 2 blocks are definitely lost in loss record 241 of 251
at 0x484378A: malloc (vg_replace_malloc.c:392)
by 0x484870B: realloc (vg_replace_malloc.c:1451)
by 0x49F771F: g_realloc (gmem.c:201)
by 0x4A11343: g_string_maybe_expand (gstring.c:92)
by 0x4A113BF: g_string_sized_new (gstring.c:116)
by 0x48E7F74: purple_unescape_html (purplemarkup.c:1101)
by 0x48DEBBA: purple_markup_html_to_xhtml (purplemarkup.c:224)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)

256 bytes in 2 blocks are definitely lost in loss record 242 of 251
at 0x484378A: malloc (vg_replace_malloc.c:392)
by 0x484870B: realloc (vg_replace_malloc.c:1451)
by 0x49F771F: g_realloc (gmem.c:201)
by 0x4A11343: g_string_maybe_expand (gstring.c:92)
by 0x4A113BF: g_string_sized_new (gstring.c:116)
by 0x48E7F74: purple_unescape_html (purplemarkup.c:1101)
by 0x48E534D: purple_markup_html_to_xhtml (purplemarkup.c:397)
by 0x401214: test_purple_markup_html_to_xhtml (test_markup.c:213)
by 0x4A1CC7D: UnknownInlinedFun (gtestutils.c:2933)
by 0x4A1CC7D: g_test_run_suite_internal (gtestutils.c:3021)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1C9E4: g_test_run_suite_internal (gtestutils.c:3038)
by 0x4A1D181: g_test_run_suite (gtestutils.c:3115)
```

Also modified the test to check not passing the optional arguments.

Testing Done:
Compiled and ran tests in valgrind and leaks were gone.

Reviewed at https://reviews.imfreedom.org/r/2379/

* finch

* Finch is the legal property of its developers, whose names are too numerous

* to list here. Please refer to the COPYRIGHT file distributed with this

* source distribution.

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

* the Free Software Foundation; either version 2 of the License, or

* (at your option) any later version.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU General Public License for more details.

* You should have received a copy of the GNU General Public License

* along with this program; if not, write to the Free Software

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

#include <errno.h>

#include <glib.h>

#include <glib/gi18n-lib.h>

#include <glib/gstdio.h>

#include <locale.h>

#include <purple.h>

#include "finchui.h"

#include "gntdebug.h"

#include "gntidle.h"

#include "gntprefs.h"

#include "libfinch.h"

#include "config.h"

#include "package_revision.h"

static gboolean

start_with_debugwin(G_GNUC_UNUSED gpointer data)

{

finch_debug_window_show();

return FALSE;

}

static void

finch_plugins_init(void) {

GPluginManager *manager = NULL;

gchar *path = NULL;

manager = gplugin_manager_get_default();

gplugin_manager_append_paths_from_environment(manager,

"FINCH_PLUGIN_PATH");

path = g_build_filename(purple_data_dir(), "plugins", NULL);

if(g_mkdir(path, S_IRUSR | S_IWUSR | S_IXUSR) != 0 && errno != EEXIST) {

fprintf(stderr, "Couldn't create plugins dir\n");

}

gplugin_manager_append_path(manager, path);

g_free(path);

gplugin_manager_append_path(manager, FINCH_LIBDIR);

purple_plugins_refresh();

}

static int

init_libpurple(G_GNUC_UNUSED int argc, char **argv)

{

gboolean opt_nologin = FALSE;

gboolean opt_version = FALSE;

gboolean opt_debug = FALSE;

char *opt_config_dir_arg = NULL;

GOptionContext *context;

gchar **args;

GError *error = NULL;

GOptionEntry option_entries[] = {

{"config", 'c', 0,

G_OPTION_ARG_FILENAME, &opt_config_dir_arg,

_("use DIR for config files"), _("DIR")},

{"debug", 'd', 0,

G_OPTION_ARG_NONE, &opt_debug,

_("open debug window on startup"), NULL},

{"nologin", 'n', 0,

G_OPTION_ARG_NONE, &opt_nologin,

_("don't automatically login"), NULL},

{"version", 'v', 0,

G_OPTION_ARG_NONE, &opt_version,

_("display the current version and exit"), NULL},

{NULL}

};

bindtextdomain(PACKAGE, PURPLE_LOCALEDIR);

bind_textdomain_codeset(PACKAGE, "UTF-8");

textdomain(PACKAGE);

setlocale(LC_ALL, "");

context = g_option_context_new(NULL);

g_option_context_set_summary(context, DISPLAY_VERSION);

g_option_context_add_main_entries(context, option_entries, PACKAGE);

g_option_context_add_group(context, purple_get_option_group());

g_option_context_add_group(context, gplugin_get_option_group());

#ifdef G_OS_WIN32

/* Handle Unicode filenames on Windows. See GOptionContext docs. */

args = g_win32_get_command_line();

#else

args = g_strdupv(argv);

#endif

if (!g_option_context_parse_strv(context, &args, &error)) {

g_strfreev(args);

g_printerr(_("%s: %s\nTry `%s -h' for more information.\n"),

DISPLAY_VERSION, error->message, argv[0]);

g_clear_error(&error);

return 1;

}

g_strfreev(args);

/* show version message */

if (opt_version) {

/* Translators may want to transliterate the name.

It is not to be translated. */

printf("%s %s (%s)\n", _("Finch"), DISPLAY_VERSION, REVISION);

return 0;

}

/* set a user-specified config directory */

if (opt_config_dir_arg != NULL) {

if (g_path_is_absolute(opt_config_dir_arg)) {

purple_util_set_user_dir(opt_config_dir_arg);

} else {

/* Make an absolute (if not canonical) path */

char *cwd = g_get_current_dir();

char *path = g_build_path(G_DIR_SEPARATOR_S, cwd, opt_config_dir_arg, NULL);

purple_util_set_user_dir(path);

g_free(path);

g_free(cwd);

}

g_free(opt_config_dir_arg);

}

* We're done piddling around with command line arguments.

* Fire up this baby.

/* We don't want debug-messages to show up and corrupt the display */

finch_debug_init_handler();

if (opt_debug) {

g_timeout_add(0, start_with_debugwin, NULL);

}

purple_idle_set_ui(finch_idle_new());

if (!purple_core_init(finch_ui_new(), &error))

{

fprintf(stderr,

_("Finch3 initialization failed!\nError message: %s\n"),

(error != NULL) ? error->message : "unknown error");

g_clear_error(&error);

return 0;

}

finch_plugins_init();

/* TODO: should this be moved into finch_prefs_init() ? */

finch_prefs_update_old();

/* load plugins we had when we quit */

purple_plugins_load_saved("/finch/plugins/loaded");

if (opt_nologin)

{

/* Set all accounts to "offline" */

PurpleSavedStatus *saved_status;

/* If we've used this type+message before, lookup the transient status */

saved_status = purple_savedstatus_find_transient_by_type_and_message(

PURPLE_STATUS_OFFLINE, NULL);

/* If this type+message is unique then create a new transient saved status */

if (saved_status == NULL)

saved_status = purple_savedstatus_new(NULL, PURPLE_STATUS_OFFLINE);

/* Set the status for each account */

purple_savedstatus_activate(saved_status);

}

else

{

/* Everything is good to go--sign on already */

if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))

purple_savedstatus_activate(purple_savedstatus_get_startup());

purple_accounts_restore_current_statuses();

}

return 1;

}

gboolean finch_start(int *argc, char ***argv)

{

/* Initialize the libpurple stuff */

if (!init_libpurple(*argc, *argv))

return FALSE;

purple_blist_show();

return TRUE;

}