===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ctfdump/ctfdump.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/ctfdump/ctfdump.c	2017/10/27 08:33:46	1.12
--- src/usr.bin/ctfdump/ctfdump.c	2017/10/27 09:22:20	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: ctfdump.c,v 1.12 2017/10/27 08:33:46 mpi Exp $ */
  
  /*
   * Copyright (c) 2016 Martin Pieuchot <mpi@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: ctfdump.c,v 1.13 2017/10/27 09:22:20 mpi Exp $ */
  
  /*
   * Copyright (c) 2016 Martin Pieuchot <mpi@openbsd.org>
***************
*** 349,360 ****
  
  	if (flags & DUMP_FUNCTION) {
  		uint16_t		*fsp, kind, vlen;
  		size_t			 idx = 0, i = -1;
  		const char		*s;
  		int			 l;
  
! 		fsp = (uint16_t *)(data + cth->cth_funcoff);
! 		while (fsp < (uint16_t *)(data + cth->cth_typeoff)) {
  			kind = CTF_INFO_KIND(*fsp);
  			vlen = CTF_INFO_VLEN(*fsp);
  			s = elf_idx2sym(&idx, STT_FUNC);
--- 349,364 ----
  
  	if (flags & DUMP_FUNCTION) {
  		uint16_t		*fsp, kind, vlen;
+ 		uint16_t		*fstart, *fend;
  		size_t			 idx = 0, i = -1;
  		const char		*s;
  		int			 l;
  
! 		fstart = (uint16_t *)(data + cth->cth_funcoff);
! 		fend = (uint16_t *)(data + cth->cth_typeoff);
! 
! 		fsp = fstart;
! 		while (fsp < fend) {
  			kind = CTF_INFO_KIND(*fsp);
  			vlen = CTF_INFO_VLEN(*fsp);
  			s = elf_idx2sym(&idx, STT_FUNC);
***************
*** 368,374 ****
  			if (s != NULL)
  				printf("(%s)", s);
  			printf(" returns: %u args: (", *fsp++);
! 			while (vlen-- > 0)
  				printf("%u%s", *fsp++, (vlen > 0) ? ", " : "");
  			printf(")\n");
  		}
--- 372,378 ----
  			if (s != NULL)
  				printf("(%s)", s);
  			printf(" returns: %u args: (", *fsp++);
! 			while (vlen-- > 0 && fsp < fend)
  				printf("%u%s", *fsp++, (vlen > 0) ? ", " : "");
  			printf(")\n");
  		}