X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode-validator.c;h=ea86c5e75126b8e517e92893bb5ee87f26e7ba77;hb=a084756d092167324ee09d3f819cc45407b58233;hp=198d2fab6c1843096a2aec550a5c8704ac276b9a;hpb=10544ee8af31afb239e3dfa71cb2fe09d3de3771;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode-validator.c b/liblttng-ust/lttng-bytecode-validator.c
index 198d2fab..ea86c5e7 100644
--- a/liblttng-ust/lttng-bytecode-validator.c
+++ b/liblttng-ust/lttng-bytecode-validator.c
@@ -1,27 +1,9 @@
 /*
- * lttng-bytecode-validator.c
- *
- * LTTng UST bytecode validator.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2010-2016 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * 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.
+ * LTTng UST bytecode validator.
  */
 
 #define _LGPL_SOURCE
@@ -35,6 +17,7 @@
 #include "lttng-hash-helper.h"
 #include "string-utils.h"
 #include "ust-events-internal.h"
+#include "ust-helper.h"
 
 /*
  * Number of merge points for hash table size. Hash table initialized to
@@ -273,11 +256,11 @@ int validate_get_symbol(struct bytecode_runtime *bytecode,
 	const char *str, *str_limit;
 	size_t len_limit;
 
-	if (sym->offset >= bytecode->p.bc->bc.len - bytecode->p.bc->bc.reloc_offset)
+	if (sym->offset >= bytecode->p.priv->bc->bc.len - bytecode->p.priv->bc->bc.reloc_offset)
 		return -EINVAL;
 
-	str = bytecode->p.bc->bc.data + bytecode->p.bc->bc.reloc_offset + sym->offset;
-	str_limit = bytecode->p.bc->bc.data + bytecode->p.bc->bc.len;
+	str = bytecode->p.priv->bc->bc.data + bytecode->p.priv->bc->bc.reloc_offset + sym->offset;
+	str_limit = bytecode->p.priv->bc->bc.data + bytecode->p.priv->bc->bc.len;
 	len_limit = str_limit - str;
 	if (strnlen(str, len_limit) == len_limit)
 		return -EINVAL;
@@ -1993,7 +1976,7 @@ int lttng_bytecode_validate(struct bytecode_runtime *bytecode)
 			goto end;
 		}
 		dbg_printf("Validating op %s (%u)\n",
-			print_op((unsigned int) *(bytecode_opcode_t *) pc),
+			lttng_bytecode_print_op((unsigned int) *(bytecode_opcode_t *) pc),
 			(unsigned int) *(bytecode_opcode_t *) pc);
 
 		/*