X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;fp=types%2Fstring.c;h=6e5c6f472b41d115181e05c57962a3c9f8676476;hp=796f05cd6a47f555c2584993d89956b9479adf02;hb=dc48ecad637fc7fb8479da563ef2dfd3948cee73;hpb=9128428b12dd68e2cfbd10ecfabcc6597de86011

diff --git a/types/string.c b/types/string.c
index 796f05cd..6e5c6f47 100644
--- a/types/string.c
+++ b/types/string.c
@@ -35,16 +35,11 @@ void string_copy(struct stream_pos *dest, const struct format *fdest,
 		container_of(definition, struct definition_string, p);
 	struct declaration_string *string_declaration = string->declaration;
 
-	if (fdest && (fsrc->string_copy == fdest->string_copy)) {
-		fsrc->string_copy(dest, src, string_declaration);
-	} else {
-		char *tmp = NULL;
-
-		fsrc->string_read(&tmp, src, string_declaration);
-		if (fdest)
-			fdest->string_write(dest, tmp, string_declaration);
-		fsrc->string_free_temp(tmp);
-	}
+	g_free(string->value);
+	string->value = NULL;
+	fsrc->string_read(&string->value, src, string_declaration);
+	if (fdest)
+		fdest->string_write(dest, string->value, string_declaration);
 }
 
 static