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

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index b19335e2..002f1b4f 100644
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -3,7 +3,9 @@
  *
  * Strings read/write functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -14,34 +16,22 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
+#include <babeltrace/babeltrace-internal.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 bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -49,23 +39,40 @@ 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_bits;
 	char *srcaddr;
 
-	ctf_align_pos(pos, string_declaration->p.alignment);
+	if (!ctf_align_pos(pos, string_declaration->p.alignment))
+		return -EFAULT;
+
 	srcaddr = ctf_get_pos_addr(pos);
-	len = strlen(srcaddr) + 1;
+	if (pos->offset == EOF)
+		return -EFAULT;
+	/* Not counting \0. Counting in bits. */
+	max_len_bits = pos->packet_size - pos->offset - CHAR_BIT;
+	if (max_len_bits < 0)
+		return -EFAULT;
+	/* Add \0, counting in bytes. */
+	len = strnlen(srcaddr, (size_t) max_len_bits / CHAR_BIT) + 1;
+	/* 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);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
+	return 0;
 }
 
-void ctf_string_write(struct stream_pos *ppos,
-		      struct definition *definition)
+int ctf_string_write(struct bt_stream_pos *ppos,
+		      struct bt_definition *definition)
 {
 	struct definition_string *string_definition =
 		container_of(definition, struct definition_string, p);
@@ -75,13 +82,20 @@ void ctf_string_write(struct stream_pos *ppos,
 	size_t len;
 	char *destaddr;
 
-	ctf_align_pos(pos, string_declaration->p.alignment);
+	if (!ctf_align_pos(pos, string_declaration->p.alignment))
+		return -EFAULT;
 	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);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
+	return 0;
 }