projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ctf: assert that name is not NULL in warn_meaningless_field()
[babeltrace.git]
/
src
/
plugins
/
ctf
/
common
/
metadata
/
ctf-meta-warn-meaningless-header-fields.c
diff --git
a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
index ebd995f62ecf71a677ea3c5ee1d7dec7c1fd5154..9a9d765a7f51c6d8f0bc52828afb78f7064a184f 100644
(file)
--- a/
src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
+++ b/
src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
@@
-32,6
+32,7
@@
static inline
void warn_meaningless_field(const char *name, const char *scope_name,
struct meta_log_config *log_cfg)
{
void warn_meaningless_field(const char *name, const char *scope_name,
struct meta_log_config *log_cfg)
{
+ BT_ASSERT(name);
BT_COMP_LOGW("User field found in %s: ignoring: name=\"%s\"",
scope_name, name);
}
BT_COMP_LOGW("User field found in %s: ignoring: name=\"%s\"",
scope_name, name);
}
@@
-46,6
+47,11
@@
void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
goto end;
}
goto end;
}
+ /*
+ * 'name' is guaranteed to be non-NULL whenever the field class is not a
+ * structure. In the case of a structure field class, its members' names
+ * are used.
+ */
switch (fc->type) {
case CTF_FIELD_CLASS_TYPE_FLOAT:
case CTF_FIELD_CLASS_TYPE_STRING:
switch (fc->type) {
case CTF_FIELD_CLASS_TYPE_FLOAT:
case CTF_FIELD_CLASS_TYPE_STRING:
This page took
0.024989 seconds
and
4
git commands to generate.