summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2021-06-03 19:31:56 -0500
committerGary Kramlich <grim@reaperworld.com>2021-06-03 19:31:56 -0500
commit201510d0f38dce06cecf57a701cd92d5536b8c63 (patch)
tree834078941bafb666d100dd1cd0f6258928eda1b5
parent6e2c683815268131ed3f603ba366acdc2efe6b12 (diff)
downloadpidgin-201510d0f38dce06cecf57a701cd92d5536b8c63.tar.gz
Fix some errors that scanbuild found
Testing Done: Verified that scanbuild no longer detects the errors. Reviewed at https://reviews.imfreedom.org/r/718/
-rw-r--r--libpurple/conversation.c2
-rw-r--r--libpurple/idle.c1
-rw-r--r--libpurple/log.c4
-rw-r--r--libpurple/mediamanager.c4
-rw-r--r--libpurple/plugin.c7
-rw-r--r--libpurple/plugins/log_reader.c9
6 files changed, 18 insertions, 9 deletions
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
index 2a60becddc..5286e2a4d7 100644
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -1852,7 +1852,7 @@ purple_conv_chat_rename_user(PurpleConvChat *chat, const char *old_user,
{
const char *display_name = purple_connection_get_display_name(gc);
if (display_name != NULL)
- alias = display_name;
+ new_alias = display_name;
}
}
} else {
diff --git a/libpurple/idle.c b/libpurple/idle.c
index 909ae72f00..04424969c3 100644
--- a/libpurple/idle.c
+++ b/libpurple/idle.c
@@ -142,7 +142,6 @@ check_idleness(void)
else
{
/* Don't report idle time */
- time_idle = 0;
report_idle = FALSE;
/* If we're not reporting idle, we can still do auto-away.
diff --git a/libpurple/log.c b/libpurple/log.c
index 6b912b12ae..9fb9f4d4ec 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -1390,7 +1390,7 @@ static gsize html_logger_write(PurpleLog *log, PurpleMessageFlags type,
data = log->logger_data;
/* if we can't write to the file, give up before we hurt ourselves */
- if(!data->file)
+ if(data == NULL || data->file == NULL)
return 0;
date = purple_date_format_full(localtime(&log->time));
@@ -1550,7 +1550,7 @@ static gsize txt_logger_write(PurpleLog *log,
data = log->logger_data;
/* if we can't write to the file, give up before we hurt ourselves */
- if(!data->file)
+ if(data == NULL || data->file == NULL)
return 0;
if (log->type == PURPLE_LOG_SYSTEM)
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
index 7e5e85dcad..23d1d739dd 100644
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -726,8 +726,9 @@ request_pad_unlinked_cb(GstPad *pad, GstPad *peer, gpointer user_data)
GstIterator *iter;
#if GST_CHECK_VERSION(1,0,0)
GValue tmp = G_VALUE_INIT;
-#endif
+#else
GstPad *remaining_pad;
+#endif
GstIteratorResult result;
gst_element_release_request_pad(parent, pad);
@@ -746,7 +747,6 @@ request_pad_unlinked_cb(GstPad *pad, GstPad *peer, gpointer user_data)
gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(parent)), parent);
} else if (result == GST_ITERATOR_OK) {
#if GST_CHECK_VERSION(1,0,0)
- remaining_pad = g_value_get_object(&tmp);
g_value_reset(&tmp);
#else
gst_object_unref(remaining_pad);
diff --git a/libpurple/plugin.c b/libpurple/plugin.c
index acddd70450..a5e98492c3 100644
--- a/libpurple/plugin.c
+++ b/libpurple/plugin.c
@@ -634,6 +634,13 @@ purple_plugin_unload(PurplePlugin *plugin)
g_return_val_if_fail(plugin != NULL, FALSE);
g_return_val_if_fail(purple_plugin_is_loaded(plugin), FALSE);
+ if(plugin->info == NULL) {
+ purple_debug_error("plugin",
+ "Failed to unload plugin %s its info is NULL",
+ plugin->path);
+ return FALSE;
+ }
+
purple_debug_info("plugins", "Unloading plugin %s\n", plugin->info->name);
/* Unload all plugins that depend on this plugin. */
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 514cdf2f27..349dcb79fc 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -1111,9 +1111,13 @@ static char * msn_logger_read (PurpleLog *log, PurpleLogReadFlags *flags)
}
msn_logger_parse_timestamp(message, &tm);
+ if(tm != NULL) {
+ timestamp = g_strdup_printf("<font size=\"2\">(%02u:%02u:%02u)</font> ",
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
+ } else {
+ timestamp = g_strdup_printf("<font size=\"2\">(00:00:00)</font> ");
+ }
- timestamp = g_strdup_printf("<font size=\"2\">(%02u:%02u:%02u)</font> ",
- tm->tm_hour, tm->tm_min, tm->tm_sec);
text = g_string_append(text, timestamp);
g_free(timestamp);
@@ -2233,7 +2237,6 @@ static GList *amsn_logger_parse_file(char *filename, const char *sn, PurpleAccou
log->logger = amsn_logger;
log->logger_data = data;
list = g_list_prepend(list, log);
- found_start = FALSE;
purple_debug_info("aMSN logger",
"Found log for %s:"