summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2021-06-01 20:14:36 -0500
committerGary Kramlich <grim@reaperworld.com>2021-06-01 20:14:36 -0500
commit7808c144e04f63fc24bb8a5f9bef6c6dd55fd80a (patch)
tree4da4f3e9c2e67f74f69867ff9d0b5d7d2aa4180d
parentcb5df15f1a8d9df97f35ab138811b73a41493ab7 (diff)
downloadpidgin-7808c144e04f63fc24bb8a5f9bef6c6dd55fd80a.tar.gz
Fix some issues scanbuild found in the log reader plugin
Testing Done: Verified scanbuild no longer detected the error. Reviewed at https://reviews.imfreedom.org/r/699/
-rw-r--r--libpurple/plugins/log_reader.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index cecd7b31cf..514cdf2f27 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -769,6 +769,7 @@ static GList *msn_logger_list(PurpleLogType type, const char *sn, PurpleAccount
const gchar *name;
while ((name = g_dir_read_name(dir))) {
+ gchar *file_path = NULL;
const char *c = name;
if (!purple_str_has_prefix(c, username))
@@ -782,16 +783,22 @@ static GList *msn_logger_list(PurpleLogType type, const char *sn, PurpleAccount
c++;
}
- path = g_build_filename(path, name, NULL);
+ file_path = g_build_filename(path, name, NULL);
if (purple_strequal(c, ".xml") &&
- g_file_test(path, G_FILE_TEST_EXISTS)) {
+ g_file_test(file_path, G_FILE_TEST_EXISTS))
+ {
found = TRUE;
+
+ g_free(path);
+ path = file_path;
+
g_free(logfile);
logfile = g_strdup(name);
+
break;
+ } else {
+ g_free(file_path);
}
- else
- g_free(path);
}
g_dir_close(dir);
}