comparison libpurple/protocols/oscar/family_feedbag.c @ 32389:fac08a235b68

Make the oscar cleanlist function ensure that buddy comments and aliases are valid utf8. If they're not, then we use purple_utf8_salvage() to fix them and save the result in our server list.

32388:3a4fc19e168e

	od->ssi.pending = NULL;
	od->ssi.timestamp = (time_t)0;
}

/**
 * This "cleans" the ssi list.  It does the following:
 * 1) Makes sure all buddies, permits, and denies have names.
 * 2) Makes sure that all buddies are in a group that exist.
 * 3) Deletes any empty groups
 *
 * @param od The oscar odion.
 * @return Return 0 if no errors, otherwise return the error number.
 */
int aim_ssi_cleanlist(OscarData *od)

				{
					aim_ssi_itemlist_del(&od->ssi.local, cur2);
				}
				cur2 = next2;
			}
		}
		cur = cur->next;
	}

	/* If we've made any changes then sync our list with the server's */

32389:fac08a235b68

	od->ssi.pending = NULL;
	od->ssi.timestamp = (time_t)0;
}

/**
 * Look up the given TLV type in the item's data.  If the value of
 * the TLV is not a valid UTF-8 string then use purple_utf8_salvage()
 * to replace invalid bytes with question marks.
 */
static void cleanlist_ensure_utf8_data(struct aim_ssi_item *item, guint16 tlvtype)
{
	aim_tlv_t *tlv;
	gchar *value, *salvaged;

	tlv = aim_tlv_gettlv(item->data, tlvtype, 1);
	if (tlv && tlv->length && !g_utf8_validate((const gchar *)tlv->value, tlv->length, NULL)) {
		purple_debug_warning("oscar", "cleanlist found invalid UTF-8 "
				"for 0x%04hx field of 0x%04hx item with name %s.  "
				"Attempting to repair.\n",
				tlvtype, item->type, item->name ? item->name : "(null)");
		value = g_strndup((const gchar *)tlv->value, tlv->length);
		salvaged = purple_utf8_salvage(value);
		g_free(value);
		if (*salvaged)
			aim_tlvlist_replace_str(&item->data, tlvtype, salvaged);
		else
			aim_tlvlist_remove(&item->data, tlvtype);
		g_free(salvaged);
	}
}

/**
 * This "cleans" the ssi list.  It does things like:
 * - Makes sure all buddies, permits, and denies have names
 * - Makes sure all buddies are in a group that exist
 * - Makes sure strings are valid UTF-8
 *
 * @param od The oscar odion.
 * @return Return 0 if no errors, otherwise return the error number.
 */
int aim_ssi_cleanlist(OscarData *od)

				{
					aim_ssi_itemlist_del(&od->ssi.local, cur2);
				}
				cur2 = next2;
			}

			/* Make sure alias is valid UTF-8 */
			cleanlist_ensure_utf8_data(cur, 0x0131);

			/* Make sure comment is valid UTF-8 */
			cleanlist_ensure_utf8_data(cur, 0x013c);
		}
		cur = cur->next;
	}

	/* If we've made any changes then sync our list with the server's */