X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-writer%2Ffields.c;h=749494cf20da88454b55a283fb4a359cc10a8e60;hb=4d4b475dfb526d016e8162c3079320f4bfe741e7;hp=8d92cb6ab7e17d1eaafc009241fdc9e0ee470448;hpb=07245ac23157616e3f4ff611341f18193de8e37d;p=babeltrace.git

diff --git a/lib/ctf-writer/fields.c b/lib/ctf-writer/fields.c
index 8d92cb6a..749494cf 100644
--- a/lib/ctf-writer/fields.c
+++ b/lib/ctf-writer/fields.c
@@ -557,8 +557,8 @@ int bt_ctf_field_string_serialize(struct bt_field_common *field,
 	BT_LOGV_STR("Creating character field from string field's character field type.");
 	character = bt_ctf_field_create(character_type);
 
-	for (i = 0; i < string->payload->len + 1; i++) {
-		const uint64_t chr = (uint64_t) string->payload->str[i];
+	for (i = 0; i < string->size + 1; i++) {
+		const uint64_t chr = (uint64_t) ((char *) string->buf->data)[i];
 
 		ret = bt_ctf_field_integer_unsigned_set_value(character, chr);
 		BT_ASSERT(ret == 0);
@@ -1097,7 +1097,7 @@ struct bt_ctf_field *bt_ctf_field_string_create(struct bt_ctf_field_type *type)
 	BT_LOGD("Creating CTF writer string field object: ft-addr=%p", type);
 
 	if (string) {
-		bt_field_common_initialize(BT_TO_COMMON(string),
+		bt_field_common_string_initialize(BT_TO_COMMON(string),
 			(void *) type,
 			(bt_object_release_func)
 				bt_ctf_field_string_destroy,