From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
If the tep handle has not defined a long size yet, then fail to parse
sizeof(long) instead of giving a wrong answer.
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
src/event-parse.c | 11 +++++++++--
utest/traceevent-utest.c | 8 ++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/event-parse.c b/src/event-parse.c
index aaa06b336efe..65937675a67f 100644
--- a/src/event-parse.c
+++ b/src/event-parse.c
@@ -3544,10 +3544,17 @@ process_sizeof(struct tep_event *event, struct tep_print_arg *arg, char **tok)
if (token && strcmp(token, "long") == 0) {
arg->atom.atom = strdup("8");
} else {
- if (event->tep->long_size == 4)
+ switch (event->tep->long_size) {
+ case 4:
arg->atom.atom = strdup("4");
- else
+ break;
+ case 8:
arg->atom.atom = strdup("8");
+ break;
+ default:
+ /* long size not defined yet, fail to parse it */
+ goto error;
+ }
/* The token is the next token */
ok = true;
}
diff --git a/utest/traceevent-utest.c b/utest/traceevent-utest.c
index 954a592d5c3c..ebd5eb93efc2 100644
--- a/utest/traceevent-utest.c
+++ b/utest/traceevent-utest.c
@@ -140,6 +140,7 @@ static char cpumask_##name##_event_data[] = { \
}
#endif
+#define SIZEOF_LONG0_FMT "[FAILED TO PARSE] s4=0 u4=0 s8=0 u8=0x0"
#define SIZEOF_LONG4_FMT "int=4 unsigned=4 unsigned int=4 long=4 unsigned long=4 long long=8 unsigned long long=8 s4=4 u4=4 s8=8 u8=8"
#define SIZEOF_LONG8_FMT "int=4 unsigned=4 unsigned int=4 long=8 unsigned long=8 long long=8 unsigned long long=8 s4=4 u4=4 s8=8 u8=8"
@@ -372,6 +373,11 @@ static void test_parse_sizeof4(void)
test_parse_sizeof(4, 4, "sizeof4", SIZEOF_LONG4_FMT);
}
+static void test_parse_sizeof_undef(void)
+{
+ test_parse_sizeof(0, 5, "sizeof_undef", SIZEOF_LONG0_FMT);
+}
+
static int test_suite_destroy(void)
{
tep_free(test_tep);
@@ -418,4 +424,6 @@ void test_traceevent_lib(void)
test_parse_sizeof8);
CU_add_test(suite, "parse sizeof() 4byte values",
test_parse_sizeof4);
+ CU_add_test(suite, "parse sizeof() no long size defined",
+ test_parse_sizeof_undef);
}
--
2.35.1
|