Mercurial > pidgin3 / changeset

--- a/configure.ac	Fri Feb 07 21:49:22 2014 +0530
+++ b/configure.ac	Sat Feb 08 16:00:14 2014 +0530
@@ -1701,7 +1701,7 @@
 	if test "$ac_kwallet_includes" != "no"; then
 		KWALLET_CXXFLAGS="-I$ac_kwallet_includes"
 	elif test "x$KDE4_CONFIG" != "xno"; then
-		KWALLET_CXXFLAGS="-I`$KDE4_CONFIG --path include`"
+		KWALLET_CXXFLAGS="$QT4_CFLAGS -I`$KDE4_CONFIG --path include`"
 	fi
 	CPPFLAGS="$CPPFLAGS $KWALLET_CXXFLAGS"
 	AC_CHECK_HEADER([kwallet.h], , [

--- a/libpurple/ciphers/pbkdf2cipher.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/ciphers/pbkdf2cipher.c	Sat Feb 08 16:00:14 2014 +0530
@@ -208,7 +208,8 @@
 	halfkey_pad = priv->out_len - (halfkey_count - 1) * halfkey_len;
 
 	salt_ext = g_new(guchar, salt_ext_len);
-	memcpy(salt_ext, priv->salt, priv->salt_len);
+	if (priv->salt_len > 0)
+		memcpy(salt_ext, priv->salt, priv->salt_len);
 
 	for (halfkey_no = 1; halfkey_no <= halfkey_count; halfkey_no++) {
 		memset(halfkey, 0, halfkey_len);

--- a/libpurple/dnssrv.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/dnssrv.c	Sat Feb 08 16:00:14 2014 +0530
@@ -134,6 +134,8 @@
 	size_t runningtotal;
 	int r;
 
+	g_return_val_if_fail(list != NULL, NULL);
+
 	runningtotal = 0;
 	cur = list;
 
@@ -154,6 +156,8 @@
 	r = runningtotal ? g_random_int_range(1, runningtotal + 1) : 0;
 	cur = list;
 	while (r > ((PurpleSrvResponseContainer *)cur->data)->sum) {
+		if (G_UNLIKELY(!cur->next))
+			break;
 		cur = cur->next;
 	}
 
@@ -177,6 +181,8 @@
 		/* Nothing to sort */
 		return;
 
+	g_return_if_fail(list != NULL);
+
 	/* First build a list of container structs */
 	for (i = 0, cur = list; i < num; i++, cur = cur->next) {
 		container = g_new(PurpleSrvResponseContainer, 1);
@@ -195,6 +201,7 @@
 		cur->data = container->response;
 		g_free(container);
 		cur = cur->next;
+		g_return_if_fail(cur);
 	}
 }
 
@@ -224,6 +231,9 @@
 	count = 1;
 	while (cur) {
 		PurpleSrvResponse *next_response;
+
+		g_return_val_if_fail(cur->data, list);
+
 		pref = ((PurpleSrvResponse *)cur->data)->pref;
 		next_response = cur->next ? cur->next->data : NULL;
 		if (!next_response || next_response->pref != pref) {

--- a/libpurple/idle.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/idle.c	Sat Feb 08 16:00:14 2014 +0530
@@ -114,7 +114,7 @@
 static void
 check_idleness(void)
 {
-	time_t time_idle;
+	time_t time_idle = 0;
 	gboolean auto_away;
 	const gchar *idle_reporting;
 	gboolean report_idle = TRUE;
@@ -142,7 +142,6 @@
 	else
 	{
 		/* Don't report idle time */
-		time_idle = 0;
 		report_idle = FALSE;
 
 		/* If we're not reporting idle, we can still do auto-away.

--- a/libpurple/log.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/log.c	Sat Feb 08 16:00:14 2014 +0530
@@ -287,6 +287,10 @@
 
 				while (logs) {
 					PurpleLog *log = (PurpleLog*)(logs->data);
+					if (!log) {
+						g_warn_if_reached();
+						continue;
+					}
 					/* Activity score counts bytes in the log, exponentially
 					   decayed with a half-life of 14 days. */
 					score_double += purple_log_get_size(log) *
@@ -447,6 +451,8 @@
 
 void purple_log_logger_free(PurpleLogLogger *logger)
 {
+	if (!logger)
+		return;
 	g_free(logger->name);
 	g_free(logger->id);
 	g_free(logger);
@@ -1571,7 +1577,7 @@
 		data = log->logger_data;
 
 		/* if we can't write to the file, give up before we hurt ourselves */
-		if(!data->file)
+		if(!data || !data->file)
 			return 0;
 
 		if (log->type == PURPLE_LOG_SYSTEM)

--- a/libpurple/plugins/log_reader.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/plugins/log_reader.c	Sat Feb 08 16:00:14 2014 +0530
@@ -917,7 +917,7 @@
 		PurpleXmlNode *to;
 		enum name_guesses name_guessed = NAME_GUESS_UNKNOWN;
 		const char *their_name;
-		struct tm *tm;
+		struct tm *tm = NULL;
 		char *timestamp;
 		char *tmp;
 		const char *style;
@@ -1096,12 +1096,16 @@
 			text = g_string_append(text, ";\">");
 		}
 
-		msn_logger_parse_timestamp(message, &tm);
-
-		timestamp = g_strdup_printf("<font size=\"2\">(%02u:%02u:%02u)</font> ",
+		if (msn_logger_parse_timestamp(message, &tm)) {
+			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);
+			text = g_string_append(text, timestamp);
+			g_free(timestamp);
+		} else {
+			text = g_string_append(text,
+				"<font size=\"2\">(00:00:00)</font> ");
+		}
 
 		if (from_name) {
 			text = g_string_append(text, "<b>");

--- a/libpurple/plugins/ssl/ssl-gnutls.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Sat Feb 08 16:00:14 2014 +0530
@@ -412,8 +412,10 @@
 	gnutls_set_default_priority(gnutls_data->session);
 #endif
 
-	gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host,
-		strlen(gsc->host));
+	if (gsc->host) {
+		gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS,
+			gsc->host, strlen(gsc->host));
+	}
 
 	gnutls_credentials_set(gnutls_data->session, GNUTLS_CRD_CERTIFICATE,
 		xcred);
@@ -1192,6 +1194,7 @@
 
 	/* Pull out the SHA1 checksum */
 	sha_bin = x509_sha1sum(crt);
+	g_return_val_if_fail(sha_bin != NULL, NULL);
 	sha_asc = purple_base16_encode_chunked(sha_bin->data, sha_bin->len);
 
 	/* Get the cert Common Name */

--- a/libpurple/util.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/util.c	Sat Feb 08 16:00:14 2014 +0530
@@ -3720,7 +3720,7 @@
 	hrs  = secs / (60 * 60);
 	secs = secs % (60 * 60);
 	mins = secs / 60;
-	secs = secs % 60;
+	/* secs = secs % 60; */
 
 	if (days > 0)
 	{
@@ -3859,8 +3859,12 @@
 		while (*tmp || *pairstart) {
 			if (*tmp == delimiter || !(*tmp)) {
 				/* If there is no explicit value */
-				if (keyend == NULL)
+				if (keyend == NULL) {
 					keyend = tmp;
+				}
+				/* without these brackets, clang won't
+				 * recognize tmp as a non-NULL
+				 */
 
 				if (keyend && keyend != pairstart) {
 					char *p;

--- a/libpurple/xfer.c	Fri Feb 07 21:49:22 2014 +0530
+++ b/libpurple/xfer.c	Sat Feb 08 16:00:14 2014 +0530
@@ -609,6 +609,8 @@
 		purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_ACCEPTED);
 		priv->ops.init(xfer);
 		return;
+	} else {
+		g_return_if_fail(filename != NULL);
 	}
 
 	buddy = purple_blist_find_buddy(account, priv->who);