Changeset 0e48e54

Timestamp:

2016-05-26T00:29:14Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

d28fe1c4

Parents:

21f450c

Message:

purple: strdup the message instead of casting to char *

Fixes trac ticket 1255, which points out that a strip_html() call down
there may modify the passed string, and some purple plugins may pass
read-only string data to it.

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -965 +965 @@
 
 /* Generic handler for IM or chat messages, covers write_chat, write_im and write_conv */
-static void handle_conv_msg(PurpleConversation *conv, const char *who, const char *message, guint32 bee_flags, time_t mtime)
+static void handle_conv_msg(PurpleConversation *conv, const char *who, const char *message_, guint32 bee_flags, time_t mtime)
 {
         struct im_connection *ic = purple_ic_by_pa(conv->account);
         struct groupchat *gc = conv->ui_data;
+        char *message = g_strdup(message_);
         PurpleBuddy *buddy;
 
@@ -977 +978 @@
 
         if (conv->type == PURPLE_CONV_TYPE_IM) {
-                imcb_buddy_msg(ic, (char *) who, (char *) message, bee_flags, mtime);
+                imcb_buddy_msg(ic, who, message, bee_flags, mtime);
         } else if (gc) {
-                imcb_chat_msg(gc, who, (char *) message, bee_flags, mtime);
-        }
+                imcb_chat_msg(gc, who, message, bee_flags, mtime);
+        }
+
+        g_free(message);
 }