comparison libpurple/protocols/sametime/sametime.c @ 18596:8261beed9653

Fixes Ticket #1707 Crash with invalid UTF-8 status message from other Sametime client

18595:f054b6fa9dfc

  gc = b->account->gc;
  pd = gc->proto_data;

  ret = mwServiceAware_getText(pd->srvc_aware, &t);
  return ret? g_markup_escape_text(ret, -1): NULL;
}


static const char *status_text(PurpleBuddy *b) {
  PurplePresence *presence;

  pd = gc->proto_data;

  message = mwServiceAware_getText(pd->srvc_aware, &idb);
  status = status_text(b);

  if(message != NULL && purple_utf8_strcasecmp(status, message)) {
    tmp = g_markup_escape_text(message, -1);
	purple_notify_user_info_add_pair(user_info, status, tmp);
    g_free(tmp);

  } else {

  if(b) {
	purple_notify_user_info_add_pair(user_info, _("Status"), status_text(b));

	/* XXX Is this adding a status message in its own section rather than with the "Status" label? */
    tmp2 = mwServiceAware_getText(pd->srvc_aware, &idb);
    if(tmp2) {
      tmp = g_markup_escape_text(tmp2, -1);
	  purple_notify_user_info_add_section_break(user_info);
	  purple_notify_user_info_add_pair(user_info, NULL, tmp);
      g_free(tmp);
    }

18596:8261beed9653

  gc = b->account->gc;
  pd = gc->proto_data;

  ret = mwServiceAware_getText(pd->srvc_aware, &t);
  
  return (ret && g_utf8_validate(ret, -1, NULL)) ? g_markup_escape_text(ret, -1): NULL;
}


static const char *status_text(PurpleBuddy *b) {
  PurplePresence *presence;

  pd = gc->proto_data;

  message = mwServiceAware_getText(pd->srvc_aware, &idb);
  status = status_text(b);

  if(message != NULL && g_utf8_validate(message, -1, NULL) && purple_utf8_strcasecmp(status, message)) {
    tmp = g_markup_escape_text(message, -1);
	purple_notify_user_info_add_pair(user_info, status, tmp);
    g_free(tmp);

  } else {

  if(b) {
	purple_notify_user_info_add_pair(user_info, _("Status"), status_text(b));

	/* XXX Is this adding a status message in its own section rather than with the "Status" label? */
    tmp2 = mwServiceAware_getText(pd->srvc_aware, &idb);
    if(tmp2 && g_utf8_validate(tmp2, -1, NULL)) {
      tmp = g_markup_escape_text(tmp2, -1);
	  purple_notify_user_info_add_section_break(user_info);
	  purple_notify_user_info_add_pair(user_info, NULL, tmp);
      g_free(tmp);
    }