comparison libpurple/xmlnode.c @ 30956:61d160a4689f

Move the call to flap_connection_schedule_destroy from oscar_chat_kill to oscar_chat_leave. This avoids having flap_connection_schedule_destroy called from purple_connerr, which itself is called by flap_connection_destroy_cb I'm hoping this change fixes #5927, the oscar crash when a flap connection is disconnected.

30955:6f9a43a2b716

# define NEWLINE_S "\r\n"
#else
# define NEWLINE_S "\n"
#endif

static xmlnode*
new_node(const char *name, XMLNodeType type)
{
	xmlnode *node = g_new0(xmlnode, 1);

	gsize real_size;

	g_return_if_fail(node != NULL);
	g_return_if_fail(data != NULL);
	g_return_if_fail(size != 0);

	real_size = size == -1 ? strlen(data) : size;

	child = new_node(NULL, XMLNODE_TYPE_DATA);

}

void
xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value)
{
	xmlnode_remove_attrib(node, attr);
	xmlnode_set_attrib_full(node, attr, NULL, NULL, value);
}

void

	xmlnode *attrib_node;

	g_return_if_fail(node != NULL);
	g_return_if_fail(attr != NULL);
	g_return_if_fail(value != NULL);

	xmlnode_remove_attrib_with_namespace(node, attr, xmlns);
	attrib_node = new_node(attr, XMLNODE_TYPE_ATTRIB);

	attrib_node->data = g_strdup(value);

30956:61d160a4689f

# define NEWLINE_S "\r\n"
#else
# define NEWLINE_S "\n"
#endif

#ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS
/*
 * The purpose of this function is to prevent us from creating XML documents
 * that contain characters that are not allowed in XML 1.0.  However, this
 * change is unfortunately REALLY slow.
 */
static gboolean is_valid_xml10(const char *str)
{
	gunichar ch;

	for (ch = g_utf8_get_char(str); str[0] != '\0'; str = g_utf8_next_char(str))
	{
		/*
		 * Valid characters in XML 1.0 are: #x9 #xA #xD
		 * [#x20-#xD7FF] [#xE000-#xFFFD] [#x10000-#x10FFFF]
		 */
		if (ch < 0x09 || (ch > 0x0a && ch < 0x0d) || (ch > 0x0d && ch < 0x20))
			return FALSE;
	}

	return TRUE;
}
#endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */

static xmlnode*
new_node(const char *name, XMLNodeType type)
{
	xmlnode *node = g_new0(xmlnode, 1);

	gsize real_size;

	g_return_if_fail(node != NULL);
	g_return_if_fail(data != NULL);
	g_return_if_fail(size != 0);

#ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS
	g_return_if_fail(is_valid_xml10(data));
#endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */

	real_size = size == -1 ? strlen(data) : size;

	child = new_node(NULL, XMLNODE_TYPE_DATA);

}

void
xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value)
{
#ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS
	g_return_if_fail(is_valid_xml10(attr));
	g_return_if_fail(is_valid_xml10(value));
#endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */

	xmlnode_remove_attrib(node, attr);
	xmlnode_set_attrib_full(node, attr, NULL, NULL, value);
}

void

	xmlnode *attrib_node;

	g_return_if_fail(node != NULL);
	g_return_if_fail(attr != NULL);
	g_return_if_fail(value != NULL);
#ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS
	g_return_if_fail(is_valid_xml10(attr));
	if (xmlns != NULL)
		g_return_if_fail(is_valid_xml10(xmlns));
	if (prefix != NULL)
		g_return_if_fail(is_valid_xml10(prefix));
	g_return_if_fail(is_valid_xml10(value));
#endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */

	xmlnode_remove_attrib_with_namespace(node, attr, xmlns);
	attrib_node = new_node(attr, XMLNODE_TYPE_ATTRIB);

	attrib_node->data = g_strdup(value);