diff options
| author | mckusick <mckusick@FreeBSD.org> | 2010-05-06 17:37:23 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2010-05-06 17:37:23 +0000 |
| commit | b25e55dcc52d6203a9ae995ca470a66b6483f71d (patch) | |
| tree | 781f2c991a11a3806fdb0891b7a615cb77ebe3ab /cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c | |
| parent | 3a0f5972a0de87aebef1af257922515700da4217 (diff) | |
| parent | f3856c6cf2fb115757967b7e32bdeb21bd27d1ee (diff) | |
| download | FreeBSD-src-b25e55dcc52d6203a9ae995ca470a66b6483f71d.zip FreeBSD-src-b25e55dcc52d6203a9ae995ca470a66b6483f71d.tar.gz | |
Final update to current version of head in preparation for reintegration.
Diffstat (limited to 'cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c index 6a9d67a..d95dd1d 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c @@ -355,14 +355,21 @@ write_type(void *arg1, void *arg2) for (i = 0, ep = tp->t_emem; ep != NULL; ep = ep->el_next) i++; /* count up enum members */ + if (i > CTF_MAX_VLEN) { + warning("enum %s has too many values: %d > %d\n", + tdesc_name(tp), i, CTF_MAX_VLEN); + i = CTF_MAX_VLEN; + } + ctt.ctt_info = CTF_TYPE_INFO(CTF_K_ENUM, isroot, i); write_sized_type_rec(b, &ctt, tp->t_size); - for (ep = tp->t_emem; ep != NULL; ep = ep->el_next) { + for (ep = tp->t_emem; ep != NULL && i > 0; ep = ep->el_next) { offset = strtab_insert(&b->ctb_strtab, ep->el_name); cte.cte_name = CTF_TYPE_NAME(CTF_STRTAB_0, offset); cte.cte_value = ep->el_number; ctf_buf_write(b, &cte, sizeof (cte)); + i--; } break; |
