# HG changeset patch
# User Richard Lowe <richlowe@richlowe.net>
# Date 1376691508 14400
# Node ID 374f51e72d3f428fb562e6589d5e2fb4af76d329
# Parent  734110b9882fc9dc610c46ea10adadaa53fbd75b
3194 dis crashes disassembling aes
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Albert Lee <trisk@nexenta.com>

diff -r 734110b9882f -r 374f51e72d3f usr/src/cmd/dis/Makefile
--- a/usr/src/cmd/dis/Makefile	Mon Aug 19 20:01:38 2013 +0530
+++ b/usr/src/cmd/dis/Makefile	Fri Aug 16 18:18:28 2013 -0400
@@ -48,3 +48,4 @@
 lint: lint_SRCS
 
 include ../Makefile.targ
+include ../Makefile.ctf
diff -r 734110b9882f -r 374f51e72d3f usr/src/cmd/dis/dis_target.c
--- a/usr/src/cmd/dis/dis_target.c	Mon Aug 19 20:01:38 2013 +0530
+++ b/usr/src/cmd/dis/dis_target.c	Fri Aug 16 18:18:28 2013 -0400
@@ -727,11 +727,12 @@
 {
 	sym_entry_t *sym;
 
-	for (sym = tgt->dt_symcache;
-	    sym != tgt->dt_symtab + tgt->dt_symcount;
-	    sym++) {
+	sym = (tgt->dt_symcache != NULL) ? tgt->dt_symcache : tgt->dt_symtab;
+
+	while (sym != (tgt->dt_symtab + tgt->dt_symcount)) {
 		if (sym->se_sym.st_value >= addr)
 			return (sym->se_sym.st_value - addr);
+		sym++;
 	}
 
 	return (0);