X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny.c;h=13249b62cdeb45068dfe7deb5b6ba8572ad2c1c2;hb=15f6e2250a9c70e622ff2973a7b359b9e9c4619c;hp=79a87d70c8b41b77195f80ee0bf8699eaeaffc53;hpb=1e37287ed69ca5c9828cb156dd567d0f3b9fea20;p=libsvgtiny.git

diff --git a/src/svgtiny.c b/src/svgtiny.c
index 79a87d7..13249b6 100644
--- a/src/svgtiny.c
+++ b/src/svgtiny.c
@@ -42,17 +42,65 @@ static svgtiny_code svgtiny_parse_poly(dom_element *poly,
 		struct svgtiny_parse_state state, bool polygon);
 static svgtiny_code svgtiny_parse_text(dom_element *text,
 		struct svgtiny_parse_state state);
-static void svgtiny_parse_position_attributes(const dom_element *node,
+static void svgtiny_parse_position_attributes(dom_element *node,
 		const struct svgtiny_parse_state state,
 		float *x, float *y, float *width, float *height);
-static void svgtiny_parse_paint_attributes(const dom_element *node,
+static void svgtiny_parse_paint_attributes(dom_element *node,
 		struct svgtiny_parse_state *state);
-static void svgtiny_parse_font_attributes(const dom_element *node,
+static void svgtiny_parse_font_attributes(dom_element *node,
 		struct svgtiny_parse_state *state);
 static void svgtiny_parse_transform_attributes(dom_element *node,
 		struct svgtiny_parse_state *state);
 static svgtiny_code svgtiny_add_path(float *p, unsigned int n,
 		struct svgtiny_parse_state *state);
+static void _svgtiny_parse_color(const char *s, svgtiny_colour *c,
+		struct svgtiny_parse_state *state);
+
+/**
+ * Set the local externally-stored parts of a parse state.
+ * Call this in functions that made a new state on the stack.
+ * Doesn't make own copy of global state, such as the interned string list.
+ */
+static void svgtiny_setup_state_local(struct svgtiny_parse_state *state)
+{
+	if (state->gradient_x1 != NULL) {
+		dom_string_ref(state->gradient_x1);
+	}
+	if (state->gradient_y1 != NULL) {
+		dom_string_ref(state->gradient_y1);
+	}
+	if (state->gradient_x2 != NULL) {
+		dom_string_ref(state->gradient_x2);
+	}
+	if (state->gradient_y2 != NULL) {
+		dom_string_ref(state->gradient_y2);
+	}
+}
+
+/**
+ * Cleanup the local externally-stored parts of a parse state.
+ * Call this in functions that made a new state on the stack.
+ * Doesn't cleanup global state, such as the interned string list.
+ */
+static void svgtiny_cleanup_state_local(struct svgtiny_parse_state *state)
+{
+	if (state->gradient_x1 != NULL) {
+		dom_string_unref(state->gradient_x1);
+		state->gradient_x1 = NULL;
+	}
+	if (state->gradient_y1 != NULL) {
+		dom_string_unref(state->gradient_y1);
+		state->gradient_y1 = NULL;
+	}
+	if (state->gradient_x2 != NULL) {
+		dom_string_unref(state->gradient_x2);
+		state->gradient_x2 = NULL;
+	}
+	if (state->gradient_y2 != NULL) {
+		dom_string_unref(state->gradient_y2);
+		state->gradient_y2 = NULL;
+	}
+}
 
 
 /**
@@ -104,6 +152,11 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 
 	UNUSED(url);
 
+	state.gradient_x1 = NULL;
+	state.gradient_y1 = NULL;
+	state.gradient_x2 = NULL;
+	state.gradient_y2 = NULL;
+
 	parser = dom_xml_parser_create(NULL, NULL,
 				       ignore_msg, NULL, &document);
 
@@ -160,20 +213,21 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 	dom_string_unref(svg_name);
 
 	/* get graphic dimensions */
+	memset(&state, 0, sizeof(state));
 	state.diagram = diagram;
 	state.document = document;
 	state.viewport_width = viewport_width;
 	state.viewport_height = viewport_height;
 
-#define SVGTINY_STRING_ACTION(s)					\
-	if (dom_string_create_interned((const uint8_t *) #s,		\
-				       strlen(#s), &state.interned_##s)	\
+#define SVGTINY_STRING_ACTION2(s,n)					\
+	if (dom_string_create_interned((const uint8_t *) #n,		\
+				       strlen(#n), &state.interned_##s)	\
 	    != DOM_NO_ERR) {						\
 		code = svgtiny_LIBDOM_ERROR;				\
 		goto cleanup;						\
 	}
 #include "svgtiny_strings.h"
-#undef SVGTINY_STRING_ACTION
+#undef SVGTINY_STRING_ACTION2
 
 	svgtiny_parse_position_attributes(svg, state, &x, &y, &width, &height);
 	diagram->width = width;
@@ -202,11 +256,12 @@ svgtiny_code svgtiny_parse(struct svgtiny_diagram *diagram,
 	dom_node_unref(document);
 
 cleanup:
-#define SVGTINY_STRING_ACTION(s)				\
+	svgtiny_cleanup_state_local(&state);
+#define SVGTINY_STRING_ACTION2(s,n)			\
 	if (state.interned_##s != NULL)			\
 		dom_string_unref(state.interned_##s);
-//#include "svgtiny_strings.h"
-#undef SVGTINY_STRING_ACTION
+#include "svgtiny_strings.h"
+#undef SVGTINY_STRING_ACTION2
 	return code;
 }
 
@@ -223,6 +278,8 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 	dom_element *child;
 	dom_exception exc;
 
+	svgtiny_setup_state_local(&state);
+
 	svgtiny_parse_position_attributes(svg, state, &x, &y, &width, &height);
 	svgtiny_parse_paint_attributes(svg, &state);
 	svgtiny_parse_font_attributes(svg, &state);
@@ -230,12 +287,13 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 	exc = dom_element_get_attribute(svg, state.interned_viewBox,
 					&view_box);
 	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
 	}
 
 	if (view_box) {
 		char *s = strndup(dom_string_data(view_box),
-				  dom_string_length(view_box));
+				  dom_string_byte_length(view_box));
 		float min_x, min_y, vwidth, vheight;
 		if (sscanf(s, "%f,%f,%f,%f",
 				&min_x, &min_y, &vwidth, &vheight) == 4 ||
@@ -252,8 +310,9 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 
 	svgtiny_parse_transform_attributes(svg, &state);
 
-	exc = dom_node_get_first_child(svg, &child);
+	exc = dom_node_get_first_child(svg, (dom_node **) (void *) &child);
 	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
 	}
 	while (child != NULL) {
@@ -271,6 +330,7 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 			exc = dom_node_get_node_name(child, &nodename);
 			if (exc != DOM_NO_ERR) {
 				dom_node_unref(child);
+				svgtiny_cleanup_state_local(&state);
 				return svgtiny_LIBDOM_ERROR;
 			}
 			if (dom_string_caseless_isequal(state.interned_svg,
@@ -310,16 +370,20 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 		}
 		if (code != svgtiny_OK) {
 			dom_node_unref(child);
+			svgtiny_cleanup_state_local(&state);
 			return code;
 		}
-		exc = dom_node_get_next_sibling(child, &next);
+		exc = dom_node_get_next_sibling(child,
+						(dom_node **) (void *) &next);
 		dom_node_unref(child);
 		if (exc != DOM_NO_ERR) {
+			svgtiny_cleanup_state_local(&state);
 			return svgtiny_LIBDOM_ERROR;
 		}
 		child = next;
 	}
 
+	svgtiny_cleanup_state_local(&state);
 	return svgtiny_OK;
 }
 
@@ -334,6 +398,7 @@ svgtiny_code svgtiny_parse_svg(dom_element *svg,
 svgtiny_code svgtiny_parse_path(dom_element *path,
 		struct svgtiny_parse_state state)
 {
+	svgtiny_code err;
 	dom_string *path_d_str;
 	dom_exception exc;
 	char *s, *path_d;
@@ -343,6 +408,8 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 	float last_cubic_x = 0, last_cubic_y = 0;
 	float last_quad_x = 0, last_quad_y = 0;
 
+	svgtiny_setup_state_local(&state);
+
 	svgtiny_parse_paint_attributes(path, &state);
 	svgtiny_parse_transform_attributes(path, &state);
 
@@ -351,25 +418,29 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 	if (exc != DOM_NO_ERR) {
 		state.diagram->error_line = -1; /* path->line; */
 		state.diagram->error_message = "path: error retrieving d attribute";
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_SVG_ERROR;
 	}
 
 	if (path_d_str == NULL) {
 		state.diagram->error_line = -1; /* path->line; */
 		state.diagram->error_message = "path: missing d attribute";
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_SVG_ERROR;
 	}
 
 	s = path_d = strndup(dom_string_data(path_d_str),
-			     dom_string_length(path_d_str));
+			     dom_string_byte_length(path_d_str));
 	dom_string_unref(path_d_str);
 	if (s == NULL) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
 	}
 	/* allocate space for path: it will never have more elements than d */
 	p = malloc(sizeof p[0] * strlen(s));
 	if (!p) {
 		free(path_d);
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
 	}
 
@@ -566,10 +637,15 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 	if (i <= 4) {
 		/* no real segments in path */
 		free(p);
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OK;
 	}
 
-	return svgtiny_add_path(p, i, &state);
+	err = svgtiny_add_path(p, i, &state);
+
+	svgtiny_cleanup_state_local(&state);
+
+	return err;
 }
 
 
@@ -582,17 +658,22 @@ svgtiny_code svgtiny_parse_path(dom_element *path,
 svgtiny_code svgtiny_parse_rect(dom_element *rect,
 		struct svgtiny_parse_state state)
 {
+	svgtiny_code err;
 	float x, y, width, height;
 	float *p;
 
+	svgtiny_setup_state_local(&state);
+
 	svgtiny_parse_position_attributes(rect, state,
 			&x, &y, &width, &height);
 	svgtiny_parse_paint_attributes(rect, &state);
 	svgtiny_parse_transform_attributes(rect, &state);
 
 	p = malloc(13 * sizeof p[0]);
-	if (!p)
+	if (!p) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
+	}
 
 	p[0] = svgtiny_PATH_MOVE;
 	p[1] = x;
@@ -608,7 +689,11 @@ svgtiny_code svgtiny_parse_rect(dom_element *rect,
 	p[11] = y + height;
 	p[12] = svgtiny_PATH_CLOSE;
 
-	return svgtiny_add_path(p, 13, &state);
+	err = svgtiny_add_path(p, 13, &state);
+
+	svgtiny_cleanup_state_local(&state);
+
+	return err;
 }
 
 
@@ -619,30 +704,39 @@ svgtiny_code svgtiny_parse_rect(dom_element *rect,
 svgtiny_code svgtiny_parse_circle(dom_element *circle,
 		struct svgtiny_parse_state state)
 {
+	svgtiny_code err;
 	float x = 0, y = 0, r = -1;
 	float *p;
 	dom_string *attr;
 	dom_exception exc;
 
+	svgtiny_setup_state_local(&state);
+
 	exc = dom_element_get_attribute(circle, state.interned_cx, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		x = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(circle, state.interned_cy, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		y = svgtiny_parse_length(attr, state.viewport_height, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(circle, state.interned_r, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		r = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
@@ -654,14 +748,19 @@ svgtiny_code svgtiny_parse_circle(dom_element *circle,
 	if (r < 0) {
 		state.diagram->error_line = -1; /* circle->line; */
 		state.diagram->error_message = "circle: r missing or negative";
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_SVG_ERROR;
 	}
-	if (r == 0)
+	if (r == 0) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OK;
+	}
 
 	p = malloc(32 * sizeof p[0]);
-	if (!p)
+	if (!p) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
+	}
 
 	p[0] = svgtiny_PATH_MOVE;
 	p[1] = x + r;
@@ -695,8 +794,12 @@ svgtiny_code svgtiny_parse_circle(dom_element *circle,
 	p[29] = x + r;
 	p[30] = y;
 	p[31] = svgtiny_PATH_CLOSE;
+
+	err = svgtiny_add_path(p, 32, &state);
+
+	svgtiny_cleanup_state_local(&state);
 	
-	return svgtiny_add_path(p, 32, &state);
+	return err;
 }
 
 
@@ -707,38 +810,49 @@ svgtiny_code svgtiny_parse_circle(dom_element *circle,
 svgtiny_code svgtiny_parse_ellipse(dom_element *ellipse,
 		struct svgtiny_parse_state state)
 {
+	svgtiny_code err;
 	float x = 0, y = 0, rx = -1, ry = -1;
 	float *p;
 	dom_string *attr;
 	dom_exception exc;
 
+	svgtiny_setup_state_local(&state);
+
 	exc = dom_element_get_attribute(ellipse, state.interned_cx, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		x = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(ellipse, state.interned_cy, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		y = svgtiny_parse_length(attr, state.viewport_height, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(ellipse, state.interned_rx, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		rx = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(ellipse, state.interned_ry, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		ry = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
@@ -751,14 +865,19 @@ svgtiny_code svgtiny_parse_ellipse(dom_element *ellipse,
 		state.diagram->error_line = -1; /* ellipse->line; */
 		state.diagram->error_message = "ellipse: rx or ry missing "
 				"or negative";
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_SVG_ERROR;
 	}
-	if (rx == 0 || ry == 0)
+	if (rx == 0 || ry == 0) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OK;
+	}
 
 	p = malloc(32 * sizeof p[0]);
-	if (!p)
+	if (!p) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
+	}
 
 	p[0] = svgtiny_PATH_MOVE;
 	p[1] = x + rx;
@@ -793,7 +912,11 @@ svgtiny_code svgtiny_parse_ellipse(dom_element *ellipse,
 	p[30] = y;
 	p[31] = svgtiny_PATH_CLOSE;
 	
-	return svgtiny_add_path(p, 32, &state);
+	err = svgtiny_add_path(p, 32, &state);
+
+	svgtiny_cleanup_state_local(&state);
+
+	return err;
 }
 
 
@@ -804,38 +927,49 @@ svgtiny_code svgtiny_parse_ellipse(dom_element *ellipse,
 svgtiny_code svgtiny_parse_line(dom_element *line,
 		struct svgtiny_parse_state state)
 {
+	svgtiny_code err;
 	float x1 = 0, y1 = 0, x2 = 0, y2 = 0;
 	float *p;
 	dom_string *attr;
 	dom_exception exc;
 
+	svgtiny_setup_state_local(&state);
+
 	exc = dom_element_get_attribute(line, state.interned_x1, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		x1 = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(line, state.interned_y1, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		y1 = svgtiny_parse_length(attr, state.viewport_height, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(line, state.interned_x2, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		x2 = svgtiny_parse_length(attr, state.viewport_width, state);
 	}
 	dom_string_unref(attr);
 
 	exc = dom_element_get_attribute(line, state.interned_y2, &attr);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	if (attr != NULL) {
 		y2 = svgtiny_parse_length(attr, state.viewport_height, state);
 	}
@@ -845,8 +979,10 @@ svgtiny_code svgtiny_parse_line(dom_element *line,
 	svgtiny_parse_transform_attributes(line, &state);
 
 	p = malloc(7 * sizeof p[0]);
-	if (!p)
+	if (!p) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
+	}
 
 	p[0] = svgtiny_PATH_MOVE;
 	p[1] = x1;
@@ -856,7 +992,11 @@ svgtiny_code svgtiny_parse_line(dom_element *line,
 	p[5] = y2;
 	p[6] = svgtiny_PATH_CLOSE;
 
-	return svgtiny_add_path(p, 7, &state);
+	err = svgtiny_add_path(p, 7, &state);
+
+	svgtiny_cleanup_state_local(&state);
+
+	return err;
 }
 
 
@@ -870,37 +1010,46 @@ svgtiny_code svgtiny_parse_line(dom_element *line,
 svgtiny_code svgtiny_parse_poly(dom_element *poly,
 		struct svgtiny_parse_state state, bool polygon)
 {
+	svgtiny_code err;
 	dom_string *points_str;
 	dom_exception exc;
 	char *s, *points;
 	float *p;
 	unsigned int i;
 
+	svgtiny_setup_state_local(&state);
+
 	svgtiny_parse_paint_attributes(poly, &state);
 	svgtiny_parse_transform_attributes(poly, &state);
 	
 	exc = dom_element_get_attribute(poly, state.interned_points,
 					&points_str);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_LIBDOM_ERROR;
+	}
 	
 	if (points_str == NULL) {
 		state.diagram->error_line = -1; /* poly->line; */
 		state.diagram->error_message =
 				"polyline/polygon: missing points attribute";
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_SVG_ERROR;
 	}
 
 	s = points = strndup(dom_string_data(points_str),
-			     dom_string_length(points_str));
+			     dom_string_byte_length(points_str));
 	dom_string_unref(points_str);
 	/* read points attribute */
-	if (s == NULL)
+	if (s == NULL) {
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
+	}
 	/* allocate space for path: it will never have more elements than s */
 	p = malloc(sizeof p[0] * strlen(s));
 	if (!p) {
 		free(points);
+		svgtiny_cleanup_state_local(&state);
 		return svgtiny_OUT_OF_MEMORY;
 	}
 
@@ -930,7 +1079,11 @@ svgtiny_code svgtiny_parse_poly(dom_element *poly,
 
 	free(points);
 
-	return svgtiny_add_path(p, i, &state);
+	err = svgtiny_add_path(p, i, &state);
+
+	svgtiny_cleanup_state_local(&state);
+
+	return err;
 }
 
 
@@ -946,6 +1099,8 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 	dom_node *child;
 	dom_exception exc;
 
+	svgtiny_setup_state_local(&state);
+
 	svgtiny_parse_position_attributes(text, state,
 			&x, &y, &width, &height);
 	svgtiny_parse_font_attributes(text, &state);
@@ -960,8 +1115,10 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 	style.font_size.value.length.value *= state.ctm.a;*/
 	
         exc = dom_node_get_first_child(text, &child);
-	if (exc != DOM_NO_ERR)
+	if (exc != DOM_NO_ERR) {
 		return svgtiny_LIBDOM_ERROR;
+		svgtiny_cleanup_state_local(&state);
+	}
 	while (child != NULL) {
 		dom_node *next;
 		dom_node_type nodetype;
@@ -970,6 +1127,7 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 		exc = dom_node_get_node_type(child, &nodetype);
 		if (exc != DOM_NO_ERR) {
 			dom_node_unref(child);
+			svgtiny_cleanup_state_local(&state);
 			return svgtiny_LIBDOM_ERROR;
 		}
 		if (nodetype == DOM_ELEMENT_NODE) {
@@ -977,6 +1135,7 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 			exc = dom_node_get_node_name(child, &nodename);
 			if (exc != DOM_NO_ERR) {
 				dom_node_unref(child);
+				svgtiny_cleanup_state_local(&state);
 				return svgtiny_LIBDOM_ERROR;
 			}
 			if (dom_string_caseless_isequal(nodename,
@@ -989,16 +1148,22 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 			dom_string *content;
 			if (shape == NULL) {
 				dom_node_unref(child);
+				svgtiny_cleanup_state_local(&state);
 				return svgtiny_OUT_OF_MEMORY;
 			}
 			exc = dom_text_get_whole_text(child, &content);
 			if (exc != DOM_NO_ERR) {
 				dom_node_unref(child);
+				svgtiny_cleanup_state_local(&state);
 				return svgtiny_LIBDOM_ERROR;
 			}
-			shape->text = strndup(dom_string_data(content),
-					      dom_string_length(content));
-			dom_string_unref(content);
+			if (content != NULL) {
+				shape->text = strndup(dom_string_data(content),
+						      dom_string_byte_length(content));
+				dom_string_unref(content);
+			} else {
+				shape->text = strdup("");
+			}
 			shape->text_x = px;
 			shape->text_y = py;
 			state.diagram->shape_count++;
@@ -1006,15 +1171,20 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
 
 		if (code != svgtiny_OK) {
 			dom_node_unref(child);
+			svgtiny_cleanup_state_local(&state);
 			return code;
 		}
 		exc = dom_node_get_next_sibling(child, &next);
 		dom_node_unref(child);
-		if (exc != DOM_NO_ERR)
+		if (exc != DOM_NO_ERR) {
+			svgtiny_cleanup_state_local(&state);
 			return svgtiny_LIBDOM_ERROR;
+		}
 		child = next;
 	}
 
+	svgtiny_cleanup_state_local(&state);
+
 	return svgtiny_OK;
 }
 
@@ -1023,32 +1193,42 @@ svgtiny_code svgtiny_parse_text(dom_element *text,
  * Parse x, y, width, and height attributes, if present.
  */
 
-void svgtiny_parse_position_attributes(const dom_element *node,
+void svgtiny_parse_position_attributes(dom_element *node,
 		const struct svgtiny_parse_state state,
 		float *x, float *y, float *width, float *height)
 {
-	xmlAttr *attr;
+	dom_string *attr;
+	dom_exception exc;
 
 	*x = 0;
 	*y = 0;
 	*width = state.viewport_width;
 	*height = state.viewport_height;
 
-	for (attr = node->properties; attr; attr = attr->next) {
-		const char *name = (const char *) attr->name;
-		const char *content = (const char *) attr->children->content;
-		if (strcmp(name, "x") == 0)
-			*x = svgtiny_parse_length(content,
-					state.viewport_width, state);
-		else if (strcmp(name, "y") == 0)
-			*y = svgtiny_parse_length(content,
-					state.viewport_height, state);
-		else if (strcmp(name, "width") == 0)
-			*width = svgtiny_parse_length(content,
-					state.viewport_width, state);
-		else if (strcmp(name, "height") == 0)
-			*height = svgtiny_parse_length(content,
-					state.viewport_height, state);
+	exc = dom_element_get_attribute(node, state.interned_x, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		*x = svgtiny_parse_length(attr, state.viewport_width, state);
+		dom_string_unref(attr);
+	}
+
+	exc = dom_element_get_attribute(node, state.interned_y, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		*y = svgtiny_parse_length(attr, state.viewport_height, state);
+		dom_string_unref(attr);
+	}
+
+	exc = dom_element_get_attribute(node, state.interned_width, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		*width = svgtiny_parse_length(attr, state.viewport_width,
+					      state);
+		dom_string_unref(attr);
+	}
+
+	exc = dom_element_get_attribute(node, state.interned_height, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		*height = svgtiny_parse_length(attr, state.viewport_height,
+					       state);
+		dom_string_unref(attr);
 	}
 }
 
@@ -1095,7 +1275,7 @@ static float _svgtiny_parse_length(const char *s, int viewport_size,
 float svgtiny_parse_length(dom_string *s, int viewport_size,
 			   const struct svgtiny_parse_state state)
 {
-	const char *ss = strndup(dom_string_data(s), dom_string_length(s));
+	char *ss = strndup(dom_string_data(s), dom_string_byte_length(s));
 	float ret = _svgtiny_parse_length(ss, viewport_size, state);
 	free(ss);
 	return ret;
@@ -1105,52 +1285,64 @@ float svgtiny_parse_length(dom_string *s, int viewport_size,
  * Parse paint attributes, if present.
  */
 
-void svgtiny_parse_paint_attributes(const dom_element *node,
+void svgtiny_parse_paint_attributes(dom_element *node,
 		struct svgtiny_parse_state *state)
 {
-	const xmlAttr *attr;
+	dom_string *attr;
+	dom_exception exc;
+	
+	exc = dom_element_get_attribute(node, state->interned_fill, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		svgtiny_parse_color(attr, &state->fill, state);
+		dom_string_unref(attr);
+	}
 
-	for (attr = node->properties; attr; attr = attr->next) {
-		const char *name = (const char *) attr->name;
-		const char *content = (const char *) attr->children->content;
-		if (strcmp(name, "fill") == 0)
-			svgtiny_parse_color(content, &state->fill, state);
-		else if (strcmp(name, "stroke") == 0)
-			svgtiny_parse_color(content, &state->stroke, state);
-		else if (strcmp(name, "stroke-width") == 0)
-			state->stroke_width = svgtiny_parse_length(content,
-					state->viewport_width, *state);
-		else if (strcmp(name, "style") == 0) {
-			const char *style = (const char *)
-					attr->children->content;
-			const char *s;
-			char *value;
-			if ((s = strstr(style, "fill:"))) {
-				s += 5;
-				while (*s == ' ')
-					s++;
-				value = strndup(s, strcspn(s, "; "));
-				svgtiny_parse_color(value, &state->fill, state);
-				free(value);
-			}
-			if ((s = strstr(style, "stroke:"))) {
-				s += 7;
-				while (*s == ' ')
-					s++;
-				value = strndup(s, strcspn(s, "; "));
-				svgtiny_parse_color(value, &state->stroke, state);
-				free(value);
-			}
-			if ((s = strstr(style, "stroke-width:"))) {
-				s += 13;
-				while (*s == ' ')
-					s++;
-				value = strndup(s, strcspn(s, "; "));
-				state->stroke_width = svgtiny_parse_length(value,
+	exc = dom_element_get_attribute(node, state->interned_stroke, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		svgtiny_parse_color(attr, &state->stroke, state);
+		dom_string_unref(attr);
+	}
+
+	exc = dom_element_get_attribute(node, state->interned_stroke_width, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		state->stroke_width = svgtiny_parse_length(attr,
 						state->viewport_width, *state);
-				free(value);
-			}
+		dom_string_unref(attr);
+	}
+
+	exc = dom_element_get_attribute(node, state->interned_style, &attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		char *style = strndup(dom_string_data(attr),
+				      dom_string_byte_length(attr));
+		const char *s;
+		char *value;
+		if ((s = strstr(style, "fill:"))) {
+			s += 5;
+			while (*s == ' ')
+				s++;
+			value = strndup(s, strcspn(s, "; "));
+			_svgtiny_parse_color(value, &state->fill, state);
+			free(value);
+		}
+		if ((s = strstr(style, "stroke:"))) {
+			s += 7;
+			while (*s == ' ')
+				s++;
+			value = strndup(s, strcspn(s, "; "));
+			_svgtiny_parse_color(value, &state->stroke, state);
+			free(value);
+		}
+		if ((s = strstr(style, "stroke-width:"))) {
+			s += 13;
+			while (*s == ' ')
+				s++;
+			value = strndup(s, strcspn(s, "; "));
+			state->stroke_width = _svgtiny_parse_length(value,
+						state->viewport_width, *state);
+			free(value);
 		}
+		free(style);
+		dom_string_unref(attr);
 	}
 }
 
@@ -1159,7 +1351,7 @@ void svgtiny_parse_paint_attributes(const dom_element *node,
  * Parse a colour.
  */
 
-void svgtiny_parse_color(const char *s, svgtiny_colour *c,
+static void _svgtiny_parse_color(const char *s, svgtiny_colour *c,
 		struct svgtiny_parse_state *state)
 {
 	unsigned int r, g, b;
@@ -1218,14 +1410,25 @@ void svgtiny_parse_color(const char *s, svgtiny_colour *c,
 	}
 }
 
+void svgtiny_parse_color(dom_string *s, svgtiny_colour *c,
+		struct svgtiny_parse_state *state)
+{
+	char *ss = strndup(dom_string_data(s), dom_string_byte_length(s));
+	_svgtiny_parse_color(ss, c, state);
+	free(ss);
+}
 
 /**
  * Parse font attributes, if present.
  */
 
-void svgtiny_parse_font_attributes(const dom_element *node,
+void svgtiny_parse_font_attributes(dom_element *node,
 		struct svgtiny_parse_state *state)
 {
+	/* TODO: Implement this, it never used to be */
+	UNUSED(node);
+	UNUSED(state);
+#ifdef WRITTEN_THIS_PROPERLY
 	const xmlAttr *attr;
 
 	UNUSED(state);
@@ -1241,6 +1444,7 @@ void svgtiny_parse_font_attributes(const dom_element *node,
 			}*/
 		}
         }
+#endif
 }
 
 
@@ -1254,14 +1458,19 @@ void svgtiny_parse_transform_attributes(dom_element *node,
 		struct svgtiny_parse_state *state)
 {
 	char *transform;
-
-	/* parse transform */
-	transform = (char *) xmlGetProp(node, (const xmlChar *) "transform");
-	if (transform) {
+	dom_string *attr;
+	dom_exception exc;
+	
+	exc = dom_element_get_attribute(node, state->interned_transform,
+					&attr);
+	if (exc == DOM_NO_ERR && attr != NULL) {
+		transform = strndup(dom_string_data(attr),
+				    dom_string_byte_length(attr));
 		svgtiny_parse_transform(transform, &state->ctm.a, &state->ctm.b,
 				&state->ctm.c, &state->ctm.d,
 				&state->ctm.e, &state->ctm.f);
-		xmlFree(transform);
+		free(transform);
+		dom_string_unref(attr);
 	}
 }