X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fbuffer-view.c;h=bfd5ac6d707d0a5f2adb18cf2dbef24f5da52a74;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=6f674f4a9828f857ada1a5e2fc3038d00ba343ba;hpb=67d8e2ef48ea2cd334bf9efd90b58b976437a3cd;p=lttng-tools.git

diff --git a/src/common/buffer-view.c b/src/common/buffer-view.c
index 6f674f4a9..bfd5ac6d7 100644
--- a/src/common/buffer-view.c
+++ b/src/common/buffer-view.c
@@ -8,9 +8,7 @@
 #include <common/buffer-view.h>
 #include <common/dynamic-buffer.h>
 #include <common/error.h>
-#include <assert.h>
 
-LTTNG_HIDDEN
 struct lttng_buffer_view lttng_buffer_view_init(
 		const char *src, size_t offset, ptrdiff_t len)
 {
@@ -18,22 +16,28 @@ struct lttng_buffer_view lttng_buffer_view_init(
 	return view;
 }
 
-LTTNG_HIDDEN
+bool lttng_buffer_view_is_valid(const struct lttng_buffer_view *view)
+{
+	return view && view->data && view->size > 0;
+}
+
 struct lttng_buffer_view lttng_buffer_view_from_view(
 		const struct lttng_buffer_view *src, size_t offset,
 		ptrdiff_t len)
 {
 	struct lttng_buffer_view view = { .data = NULL, .size = 0 };
 
-	assert(src);
+	LTTNG_ASSERT(src);
 
 	if (offset > src->size) {
-		ERR("Attempt to create buffer view with invalid offset");
+		ERR("Attempt to create buffer view from another view with invalid offset (offset > source size): source size = %zu, offset in source = %zu, length = %zd",
+				src->size, offset, len);
 		goto end;
 	}
 
 	if (len != -1 && len > (src->size - offset)) {
-		ERR("Attempt to create buffer view with invalid length");
+		ERR("Attempt to create buffer view from another view with invalid length (length > space left after offset in source): source size = %zu, offset in source = %zu, length = %zd",
+				src->size, offset, len);
 		goto end;
 	}
 
@@ -43,22 +47,23 @@ end:
 	return view;
 }
 
-LTTNG_HIDDEN
 struct lttng_buffer_view lttng_buffer_view_from_dynamic_buffer(
 		const struct lttng_dynamic_buffer *src, size_t offset,
 		ptrdiff_t len)
 {
 	struct lttng_buffer_view view = { .data = NULL, .size = 0 };
 
-	assert(src);
+	LTTNG_ASSERT(src);
 
 	if (offset > src->size) {
-		ERR("Attempt to create buffer view with invalid offset");
+		ERR("Attempt to create buffer view from a dynamic buffer with invalid offset (offset > source size): source size = %zu, offset in source = %zu, length = %zd",
+				src->size, offset, len);
 		goto end;
 	}
 
 	if (len != -1 && len > (src->size - offset)) {
-		ERR("Attempt to create buffer view with invalid length");
+		ERR("Attempt to create buffer view from a dynamic buffer with invalid length (length > space left after offset in source): source size = %zu, offset in source = %zu, length = %zd",
+				src->size, offset, len);
 		goto end;
 	}
 
@@ -68,7 +73,6 @@ end:
 	return view;
 }
 
-LTTNG_HIDDEN
 bool lttng_buffer_view_contains_string(const struct lttng_buffer_view *buf,
 		const char *str,
 		size_t len_with_null_terminator)