Hello community,

here is the log from the commit of package empathy for openSUSE:11.4
checked in at Fri Nov 4 15:08:27 CET 2011.



--------
--- old-versions/11.4/UPDATES/all/empathy/empathy.changes       2011-10-28 
10:42:24.000000000 +0200
+++ 11.4/empathy/empathy.changes        2011-11-01 05:27:41.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov  1 04:23:29 UTC 2011 - [email protected]
+
+- Update empathy-cve-2011-3635.patch to use escaped name
+  everywhere in theme_adium_append_message
+
+-------------------------------------------------------------------

calling whatdependson for 11.4-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ empathy.spec ++++++
--- /var/tmp/diff_new_pack.OTjHOE/_old  2011-11-04 15:05:49.000000000 +0100
+++ /var/tmp/diff_new_pack.OTjHOE/_new  2011-11-04 15:05:49.000000000 +0100
@@ -19,7 +19,7 @@
 
 Name:           empathy
 Version:        2.32.2
-Release:        7.<RELEASE8>
+Release:        7.<RELEASE10>
 License:        GPLv2+
 Summary:        Instant Messenger Client for GNOME, based on Telepathy
 Url:            http://live.gnome.org/Empathy

++++++ empathy-cve-2011-3635.patch ++++++
--- /var/tmp/diff_new_pack.OTjHOE/_old  2011-11-04 15:05:49.000000000 +0100
+++ /var/tmp/diff_new_pack.OTjHOE/_new  2011-11-04 15:05:49.000000000 +0100
@@ -11,19 +11,31 @@
        const gchar           *body;
        const gchar           *name;
        const gchar           *contact_id;
-@@ -599,8 +599,10 @@ theme_adium_append_message (EmpathyChatV
-       }
+@@ -469,12 +469,13 @@ theme_adium_append_message (EmpathyChatV
+       body_escaped = theme_adium_parse_body (body);
+       name = empathy_contact_get_alias (sender);
+       contact_id = empathy_contact_get_id (sender);
++      name_escaped = g_markup_escape_text (name, -1);
+ 
+       /* If this is a /me, append an event */
+       if (empathy_message_get_tptype (msg) == 
TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
+               gchar *str;
+ 
+-              str = g_strdup_printf ("%s %s", name, body_escaped);
++              str = g_strdup_printf ("%s %s", name_escaped, body_escaped);
+               theme_adium_append_event_escaped (view, str);
+ 
+               g_free (str);
+@@ -600,7 +601,7 @@ theme_adium_append_message (EmpathyChatV
  
        if (html != NULL) {
-+              name_escaped = g_markup_escape_text (name, -1);
-+
                theme_adium_append_html (theme, func, html, len, body_escaped,
 -                                       avatar_filename, name, contact_id,
 +                                       avatar_filename, name_escaped, 
contact_id,
                                         service_name, message_classes->str,
                                         timestamp, is_backlog);
        } else {
-@@ -616,6 +618,7 @@ theme_adium_append_message (EmpathyChatV
+@@ -616,6 +617,7 @@ theme_adium_append_message (EmpathyChatV
        priv->last_is_backlog = is_backlog;
  
        g_free (body_escaped);

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to