X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=b62f33d7354f5649ac01c695cd71d2c64fc737e8;hp=09ce18471031be1a063307e70f30571be24fe1c6;hb=b5bf4179a8ae55a9da305834564e2090f1c179bf;hpb=07fdca67c0924ab6adf5eebad88473f71b6bf9c3

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 09ce1847..b62f33d7 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -350,6 +350,11 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth,
 
 		/* TYPEDEC_NESTED */
 
+		if (!nested_declaration) {
+			fprintf(fd, "[error] %s: nested type is unknown.\n", __func__);
+			return NULL;
+		}
+
 		/* create array/sequence, pass nested_declaration as child. */
 		if (cds_list_empty(&node_type_declarator->u.type_declarator.u.nested.length)) {
 			fprintf(fd, "[error] %s: expecting length field reference or value.\n", __func__);
@@ -1187,6 +1192,8 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 			else if (!strcmp(s_right, "ASCII")
 			    || !strcmp(s_right, "ascii"))
 				encoding = CTF_STRING_ASCII;
+			else if (!strcmp(s_right, "none"))
+				encoding = CTF_STRING_NONE;
 			else {
 				fprintf(fd, "[error] %s: unknown string encoding \"%s\"\n", __func__, s_right);
 				g_free(s_right);