Commits November 2013

commits@lists.geany.org

1 participants
39 discussions

[geany/geany] b2f471: Plug a memory leak on Windows
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 22:35:55 UTC Commit: b2f4717ad301777ca9cfb77fca38f4dc8d3d90a6 https://github.com/geany/geany/commit/b2f4717ad301777ca9cfb77fca38f4dc8d3d9… Log Message: ----------- Plug a memory leak on Windows Modified Paths: -------------- src/build.c Modified: src/build.c 9 files changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -771,7 +771,6 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d gchar **argv; gchar *working_dir; gchar *utf8_working_dir; - gchar *cmd_string; gchar *utf8_cmd_string; #ifdef SYNC_SPAWN gchar *output[2]; @@ -791,19 +790,17 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d clear_all_errors(); SETPTR(current_dir_entered, NULL); - cmd_string = g_strdup(cmd); - #ifdef G_OS_WIN32 - argv = g_strsplit(cmd_string, " ", 0); + argv = g_strsplit(cmd, " ", 0); #else argv = g_new0(gchar *, 4); argv[0] = g_strdup("/bin/sh"); argv[1] = g_strdup("-c"); - argv[2] = cmd_string; + argv[2] = g_strdup(cmd); argv[3] = NULL; #endif - utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); + utf8_cmd_string = utils_get_utf8_from_locale(cmd); utf8_working_dir = !EMPTY(dir) ? g_strdup(dir) : g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 591853: Explicit a valid cast
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 21:31:00 UTC Commit: 5918532ab23fdd310266792b999e3133de996747 https://github.com/geany/geany/commit/5918532ab23fdd310266792b999e3133de996… Log Message: ----------- Explicit a valid cast Modified Paths: -------------- src/main.c Modified: src/main.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -539,7 +539,7 @@ static void parse_command_line_options(gint *argc, gchar ***argv) continue; cl_options.goto_line = atoi((*argv)[i] + 1); - (*argv)[i] = "--dummy"; + (*argv)[i] = (gchar *) "--dummy"; } context = g_option_context_new(_("[FILES...]")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cb588a: Plug a possible memory leak
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 21:30:55 UTC Commit: cb588a1b82d0e85c0cdb9e422d073b4dc9b04a30 https://github.com/geany/geany/commit/cb588a1b82d0e85c0cdb9e422d073b4dc9b04… Log Message: ----------- Plug a possible memory leak Modified Paths: -------------- src/main.c Modified: src/main.c 11 files changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -647,10 +647,9 @@ static void parse_command_line_options(gint *argc, gchar ***argv) static gint create_config_dir(void) { gint saved_errno = 0; - gchar *conf_file = g_build_filename(app->configdir, "geany.conf", NULL); - gchar *filedefs_dir = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL); - - gchar *templates_dir = g_build_filename(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); + gchar *conf_file = NULL; + gchar *filedefs_dir = NULL; + gchar *templates_dir = NULL; if (! g_file_test(app->configdir, G_FILE_TEST_EXISTS)) { @@ -697,6 +696,10 @@ static gint create_config_dir(void) saved_errno = utils_mkdir(app->configdir, TRUE); } + conf_file = g_build_filename(app->configdir, "geany.conf", NULL); + filedefs_dir = g_build_filename(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL); + templates_dir = g_build_filename(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); + if (saved_errno == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) { /* check whether geany.conf can be written */ saved_errno = utils_is_file_writable(app->configdir); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0cb139: Plug a memory leak
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 21:18:50 UTC Commit: 0cb139638f18c8b633ce7ad5bd3fb0a4f0dfc869 https://github.com/geany/geany/commit/0cb139638f18c8b633ce7ad5bd3fb0a4f0dfc… Log Message: ----------- Plug a memory leak Modified Paths: -------------- src/templates.c Modified: src/templates.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -630,7 +630,7 @@ static gchar *run_command(const gchar *command, const gchar *file_name, { g_warning("templates_replace_command: %s", error->message); g_error_free(error); - return NULL; + result = NULL; } g_strfreev(argv); g_strfreev(env); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bc6c34: Remove an unused variable that could be leaked
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 21:18:26 UTC Commit: bc6c345153f2020fb64827e5a8442e4ecc2794e9 https://github.com/geany/geany/commit/bc6c345153f2020fb64827e5a8442e4ecc279… Log Message: ----------- Remove an unused variable that could be leaked Modified Paths: -------------- src/build.c Modified: src/build.c 7 files changed, 2 insertions(+), 5 deletions(-) =================================================================== @@ -868,7 +868,6 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d * when vc->skip_run_script is set, otherwise it will be set to NULL */ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript, guint cmdindex) { - gchar *locale_filename = NULL; GeanyBuildCommand *cmd = NULL; gchar *executable = NULL; gchar *working_dir = NULL; @@ -882,8 +881,6 @@ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript, if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = NULL; - locale_filename = utils_get_locale_from_utf8(doc->file_name); - cmd = get_build_cmd(doc, GEANY_GBG_EXEC, cmdindex, NULL); cmd_string = build_replace_placeholder(doc, cmd->command); @@ -912,7 +909,7 @@ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript, if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = cmd_string; - utils_free_pointers(2, executable, locale_filename, NULL); + utils_free_pointers(1, executable, NULL); return working_dir; } else @@ -932,7 +929,7 @@ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript, g_error_free(error); } - utils_free_pointers(4, cmd_string, tmp, executable, locale_filename, NULL); + utils_free_pointers(3, cmd_string, tmp, executable, NULL); if (result) return working_dir; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6e46cc: Fix mismatching allocation and deallocation
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 00:52:27 UTC Commit: 6e46cca735fc4ab19c629f5a2d47aad2180cb302 https://github.com/geany/geany/commit/6e46cca735fc4ab19c629f5a2d47aad2180cb… Log Message: ----------- Fix mismatching allocation and deallocation When allocation with g_malloc(), the memory should be freed using g_free(), not plain free(). Also, use g_try_malloc() instead of g_malloc() where the code carefully handles allocation failures itself. Modified Paths: -------------- tagmanager/ctags/sort.c Modified: tagmanager/ctags/sort.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -65,7 +65,7 @@ extern void externalSortTags (const boolean toStdout) PE_CONST char *const sortOrder2 = "LC_ALL=C"; const size_t length = 4 + strlen (sortOrder1) + strlen (sortOrder2) + strlen (sortCommand) + (2 * strlen (tagFileName ())); - char *const cmd = (char *) g_malloc (length + 1); + char *const cmd = (char *) g_try_malloc (length + 1); int ret = -1; if (cmd != NULL) @@ -165,7 +165,7 @@ extern void internalSortTags (const boolean toStdout) */ size_t numTags = TagFile.numTags.added + TagFile.numTags.prev; const size_t tableSize = numTags * sizeof (char *); - char **const table = (char **) g_malloc (tableSize); /* line pointers */ + char **const table = (char **) g_try_malloc (tableSize); /* line pointers */ DebugStatement ( size_t mallocSize = tableSize; ) /* cumulative total */ if (table == NULL) @@ -191,7 +191,7 @@ extern void internalSortTags (const boolean toStdout) { const size_t stringSize = strlen (line) + 1; - table [i] = (char *) g_malloc (stringSize); + table [i] = (char *) g_try_malloc (stringSize); if (table [i] == NULL) failedSort (mio, "out of memory"); DebugStatement ( mallocSize += stringSize; ) @@ -211,8 +211,8 @@ extern void internalSortTags (const boolean toStdout) PrintStatus (("sort memory: %ld bytes\n", (long) mallocSize)); for (i = 0 ; i < numTags ; ++i) - free (table [i]); - free (table); + g_free (table [i]); + g_free (table); } #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 47609e: Plug a possible memory leak
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 00:52:12 UTC Commit: 47609ec102eb31dcd7d558a7cb8a1bcdbffff81d https://github.com/geany/geany/commit/47609ec102eb31dcd7d558a7cb8a1bcdbffff… Log Message: ----------- Plug a possible memory leak Modified Paths: -------------- src/utils.c Modified: src/utils.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1798,7 +1798,7 @@ gboolean utils_is_remote_path(const gchar *path) * @see tm_get_real_path() - also resolves links. */ void utils_tidy_path(gchar *filename) { - GString *str = g_string_new(filename); + GString *str; const gchar *c, *needle; gchar *tmp; gssize pos; @@ -1806,6 +1806,8 @@ void utils_tidy_path(gchar *filename) g_return_if_fail(g_path_is_absolute(filename)); + str = g_string_new(filename); + if (str->len >= 2 && strncmp(str->str, "\\\\", 2) == 0) preserve_double_backslash = TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 02852b: Simplify utils_get_hex_from_color() and plug a possible memory leak in it
by Colomban Wendling 03 Nov '13

03 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Nov 2013 00:51:03 UTC Commit: 02852b33b07491d99ad44f6f58fd654bee76244e https://github.com/geany/geany/commit/02852b33b07491d99ad44f6f58fd654bee762… Log Message: ----------- Simplify utils_get_hex_from_color() and plug a possible memory leak in it Modified Paths: -------------- src/utils.c Modified: src/utils.c 12 files changed, 4 insertions(+), 8 deletions(-) =================================================================== @@ -863,16 +863,12 @@ gchar *utils_get_setting_string(GKeyFile *config, const gchar *section, const gc gchar *utils_get_hex_from_color(GdkColor *color) { - gchar *buffer = g_malloc0(9); - g_return_val_if_fail(color != NULL, NULL); - g_snprintf(buffer, 8, "#%02X%02X%02X", - (guint) (utils_scale_round(color->red / 256, 255)), - (guint) (utils_scale_round(color->green / 256, 255)), - (guint) (utils_scale_round(color->blue / 256, 255))); - - return buffer; + return g_strdup_printf("#%02X%02X%02X", + (guint) (utils_scale_round(color->red / 256, 255)), + (guint) (utils_scale_round(color->green / 256, 255)), + (guint) (utils_scale_round(color->blue / 256, 255))); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fd18b7: Plug a possible memory leak
by Colomban Wendling 02 Nov '13

02 Nov '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 02 Nov 2013 21:10:32 UTC Commit: fd18b7455c154a51b91c45c5216c9ecc047b4227 https://github.com/geany/geany/commit/fd18b7455c154a51b91c45c5216c9ecc047b4… Log Message: ----------- Plug a possible memory leak There is no need to check doc->real_path since the usage is NULL-safe, and if it actually is empty or NULL it isn't a bug in the caller itself anyway, and this could leak. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -4861,8 +4861,6 @@ static void on_document_save(GObject *obj, GeanyDocument *doc) { gchar *f = g_build_filename(app->configdir, "snippets.conf", NULL); - g_return_if_fail(!EMPTY(doc->real_path)); - if (utils_str_equal(doc->real_path, f)) { /* reload snippets */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2013