--- libmusicbrainz-2.1.1/lib/rdfparse.c.cve-2006-4197-2	2006-08-29 12:35:49.858367551 -0600
+++ libmusicbrainz-2.1.1/lib/rdfparse.c	2006-08-29 12:36:14.788903586 -0600
@@ -566,7 +566,8 @@ parse_uri(
 		while( *s != T( ':' ) )
 		{
 			if (d < endp)
-				*d++ = *s++;
+				*d++ = *s;
+			s++;
 		}
 
 		if (d < endp)
@@ -588,7 +589,8 @@ parse_uri(
 			&& *s != T( '#' ) )
 		{
 			if (d < endp)
-				*d++ = *s++;
+				*d++ = *s;
+			s++;
 		}
 
 		if (d < endp)
@@ -604,7 +606,8 @@ parse_uri(
 			&& *s != T( '#' ) )
 		{
 			if (d < endp)
-				*d++ = *s++;
+				*d++ = *s;
+			s++;
 		}
 
 		if (d < endp)
@@ -621,7 +624,8 @@ parse_uri(
 			&& *s != T( '#' ) )
 		{
 			if (d < endp)
-				*d++ = *s++;
+				*d++ = *s;
+			s++;
 		}
 
 		if (d < endp)
@@ -637,7 +641,8 @@ parse_uri(
 		while( *s != 0 )
 		{
 			if (d < endp)
-				*d++ = *s++;
+				*d++ = *s;
+			s++;
 		}
 
 		if (d < endp)
@@ -760,7 +765,8 @@ resolve_uri_reference(
 					while( s <= p )
 					{
 						if (d < endp)
-							*d++ = *s++;
+							*d++ = *s;
+						s++;
 					}
 
 					*d++ = 0;
@@ -791,7 +797,8 @@ resolve_uri_reference(
 								while( *s != 0 )
 								{
 									if (d < endp)
-										*d++ = *s++;
+										*d++ = *s;
+									s++;
 								}
 
 								*d = 0;
@@ -855,7 +862,8 @@ resolve_uri_reference(
 										while( *s != 0 )
 										{
 											if (d < endp)
-												*d++ = *s++;
+												*d++ = *s;
+											s++;
 										}
 
 										*d = 0;