X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=197a7e135f276825ae9e29f85a70b20636755c13;hp=b19335e2b860d4418fde30cb0d4526726896e048;hb=670977d3f384db208f375255a83060d90075d626;hpb=d11e9c4975d88591e2324b6b11f426a22995833f

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index b19335e2..197a7e13 100644
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -16,32 +16,12 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/ctf/types.h>
 #include <limits.h>		/* C99 limits */
 #include <string.h>
 
-void ctf_string_copy(struct stream_pos *pdest, struct stream_pos *psrc,
-		     const struct declaration_string *string_declaration)
-{
-	struct ctf_stream_pos *dest = ctf_pos(pdest);
-	struct ctf_stream_pos *src = ctf_pos(psrc);
-	size_t len;
-	char *destaddr, *srcaddr;
-
-	ctf_align_pos(src, string_declaration->p.alignment);
-	srcaddr = ctf_get_pos_addr(src);
-	len = strlen(srcaddr) + 1;
-	if (dest->dummy)
-		goto end;
-	ctf_align_pos(dest, string_declaration->p.alignment);
-	destaddr = ctf_get_pos_addr(dest);
-	strcpy(destaddr, srcaddr);
-end:
-	ctf_move_pos(dest, len);
-	ctf_move_pos(src, len);
-}
-
-void ctf_string_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -49,22 +29,36 @@ void ctf_string_read(struct stream_pos *ppos, struct definition *definition)
 		string_definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	size_t len;
+	ssize_t max_len;
 	char *srcaddr;
 
 	ctf_align_pos(pos, string_declaration->p.alignment);
+
 	srcaddr = ctf_get_pos_addr(pos);
-	len = strlen(srcaddr) + 1;
+	if (pos->offset == EOF)
+		return -EFAULT;
+	/* Not counting \0 */
+	max_len = pos->packet_size - pos->offset - 1;
+	if (max_len < 0)
+		return -EFAULT;
+	len = strnlen(srcaddr, max_len) + 1;	/* Add \0 */
+	/* Truncated string, unexpected. Trace probably corrupted. */
+	if (srcaddr[len - 1] != '\0')
+		return -EFAULT;
+
 	if (string_definition->alloc_len < len) {
 		string_definition->value =
 			g_realloc(string_definition->value, len);
 		string_definition->alloc_len = len;
 	}
+	printf_debug("CTF string read %s\n", srcaddr);
 	memcpy(string_definition->value, srcaddr, len);
 	string_definition->len = len;
-	ctf_move_pos(pos, len);
+	ctf_move_pos(pos, len * CHAR_BIT);
+	return 0;
 }
 
-void ctf_string_write(struct stream_pos *ppos,
+int ctf_string_write(struct stream_pos *ppos,
 		      struct definition *definition)
 {
 	struct definition_string *string_definition =
@@ -78,10 +72,15 @@ void ctf_string_write(struct stream_pos *ppos,
 	ctf_align_pos(pos, string_declaration->p.alignment);
 	assert(string_definition->value != NULL);
 	len = string_definition->len;
+
+	if (!ctf_pos_access_ok(pos, len))
+		return -EFAULT;
+
 	if (pos->dummy)
 		goto end;
 	destaddr = ctf_get_pos_addr(pos);
-	strcpy(destaddr, string_definition->value);
+	memcpy(destaddr, string_definition->value, len);
 end:
-	ctf_move_pos(pos, len);
+	ctf_move_pos(pos, len * CHAR_BIT);
+	return 0;
 }