From 9869a4d8f903186ef29eefb26a5c6380ad0ab0e1 Mon Sep 17 00:00:00 2001
From: Dennis Goodlett <dennis+git_swoops@hurricanelabs.com>
Date: Tue, 21 Jul 2020 04:16:28 -0400
Subject: [PATCH] Fix r_anal_get_bbaddr to include internal addrs ##anal
 (#17309)

---
 libr/anal/bb.c       |  2 +-
 test/db/cmd/cmd_seek | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/libr/anal/bb.c b/libr/anal/bb.c
index 6b8b8d604b..55e999f703 100644
--- a/libr/anal/bb.c
+++ b/libr/anal/bb.c
@@ -115,6 +115,6 @@ R_API ut64 r_anal_bb_size_i(RAnalBlock *bb, int i) {
 /* returns the address of the basic block that contains addr or UT64_MAX if
  * there is no such basic block */
 R_API ut64 r_anal_get_bbaddr(RAnal *anal, ut64 addr) {
-	RAnalBlock *bb = r_anal_get_block_at (anal, addr);
+	RAnalBlock *bb = r_anal_bb_from_offset (anal, addr);
 	return bb? bb->addr: UT64_MAX;
 }
diff --git a/test/db/cmd/cmd_seek b/test/db/cmd/cmd_seek
index 785176a13a..479e9f54be 100644
--- a/test/db/cmd/cmd_seek
+++ b/test/db/cmd/cmd_seek
@@ -355,3 +355,17 @@ EXPECT=<<EOF
 0x20
 EOF
 RUN
+
+NAME=seek to bb start (sb)
+FILE=bins/elf/vim
+CMDS=<<EOF
+s 0x543a0
+af
+s+3
+sb
+?v $$
+EOF
+EXPECT=<<EOF
+0x543a0
+EOF
+RUN