X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstring.c;h=a9cff6de28ceb3fe1a33f51c38d1d7546292c599;hp=4ab305249b7d096c50cc9cdf2db1b011010067f5;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hpb=c5e74408f9786219f6b44400dcf2098ab9cc78fb

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 4ab30524..a9cff6de 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,14 +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.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
-#include <limits.h>		/* C99 limits */
-#include <string.h>
+#include <babeltrace/compat/limits.h>	/* C99 limits */
+#include <babeltrace/compat/string.h>
 
-int 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);
@@ -29,17 +39,21 @@ int 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;
+	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);
-	/* Not counting \0 */
-	max_len = pos->packet_size - pos->offset - 1;
-	if (max_len < 0)
+	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;
-	len = strnlen(srcaddr, max_len) + 1;	/* Add \0 */
+	/* 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;
@@ -52,12 +66,13 @@ int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
 	printf_debug("CTF string read %s\n", srcaddr);
 	memcpy(string_definition->value, srcaddr, len);
 	string_definition->len = len;
-	ctf_move_pos(pos, len * CHAR_BIT);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
 	return 0;
 }
 
-int 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);
@@ -67,7 +82,8 @@ int 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;
 
@@ -79,6 +95,7 @@ int ctf_string_write(struct stream_pos *ppos,
 	destaddr = ctf_get_pos_addr(pos);
 	memcpy(destaddr, string_definition->value, len);
 end:
-	ctf_move_pos(pos, len * CHAR_BIT);
+	if (!ctf_move_pos(pos, len * CHAR_BIT))
+		return -EFAULT;
 	return 0;
 }