X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=c455f9b2f7758f0bec20924c8232d1dfdc04dec8;hp=125e7b3b484814b3b3620044d006357b8df02c3f;hb=5ea98697b9f786ac73fd5152d96aebe02906a10d;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 125e7b3b..c455f9b2 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,62 +16,86 @@
  *
  * 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>
+#include <babeltrace/compat/string.h>
 
-void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
-		     const struct type_string *string_type)
+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);
+	const struct declaration_string *string_declaration =
+		string_definition->declaration;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	size_t len;
-	char *destaddr, *srcaddr;
+	ssize_t max_len_bits;
+	char *srcaddr;
 
-	align_pos(src, string_type->p.alignment);
-	srcaddr = get_pos_addr(src);
-	len = strlen(srcaddr) + 1;
-	if (dest->dummy)
-		goto end;
-	align_pos(dest, string_type->p.alignment);
-	destaddr = get_pos_addr(dest);
-	strcpy(destaddr, srcaddr);
-end:
-	move_pos(dest, len);
-	move_pos(src, len);
-}
+	if (!ctf_align_pos(pos, string_declaration->p.alignment))
+		return -EFAULT;
 
-void ctf_string_read(char **dest, struct stream_pos *src,
-		     const struct type_string *string_type)
-{
-	size_t len;
-	char *srcaddr;
+	srcaddr = ctf_get_pos_addr(pos);
+	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 = bt_strnlen(srcaddr, (size_t) max_len_bits / CHAR_BIT) + 1;
+	/* Truncated string, unexpected. Trace probably corrupted. */
+	if (srcaddr[len - 1] != '\0')
+		return -EFAULT;
 
-	align_pos(src, string_type->p.alignment);
-	srcaddr = get_pos_addr(src);
-	len = strlen(srcaddr) + 1;
-	*dest = g_realloc(*dest, len);
-	strcpy(*dest, srcaddr);
-	move_pos(src, len);
+	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;
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
+	return 0;
 }
 
-void ctf_string_write(struct stream_pos *dest, const char *src,
-		      const struct type_string *string_type)
+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);
+	const struct declaration_string *string_declaration =
+		string_definition->declaration;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	size_t len;
 	char *destaddr;
 
-	align_pos(dest, string_type->p.alignment);
-	len = strlen(src) + 1;
-	if (dest->dummy)
+	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 = get_pos_addr(dest);
-	strcpy(destaddr, src);
+	destaddr = ctf_get_pos_addr(pos);
+	memcpy(destaddr, string_definition->value, len);
 end:
-	move_pos(dest, len);
-}
-
-void ctf_string_free_temp(char *string)
-{
-	g_free(string);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
+	return 0;
 }