From fc534df099dbab3b831b18bb6666f06c7e231fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 22 Jan 2019 16:35:44 +0100
Subject: [PATCH] Fix CutterCore::getAllRelocs() for RBTree (#1135)

* Fix CutterCore::getAllRelocs() for RBTree

* Update r2 submodule for RBTree C++ fix
---
 radare2        | 2 +-
 src/Cutter.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/radare2 b/radare2
index bbe5c2a3..2032399c 160000
--- a/radare2
+++ b/radare2
@@ -1 +1 @@
-Subproject commit bbe5c2a31e984a93e465afbc4892352857e8aae9
+Subproject commit 2032399ca89bda5539af120ee201f77b4564c1ba
diff --git a/src/Cutter.cpp b/src/Cutter.cpp
index 4021876e..4b4e15c7 100644
--- a/src/Cutter.cpp
+++ b/src/Cutter.cpp
@@ -1619,12 +1619,13 @@ QList<CommentDescription> CutterCore::getAllComments(const QString &filterType)
 QList<RelocDescription> CutterCore::getAllRelocs()
 {
     CORE_LOCK();
-    RListIter *it;
     QList<RelocDescription> ret;
 
-    RBinReloc *br;
     if (core_ && core_->bin && core_->bin->cur && core_->bin->cur->o) {
-        CutterRListForeach(core_->bin->cur->o->relocs, it, RBinReloc, br) {
+        auto relocs = core_->bin->cur->o->relocs;
+        RBIter iter;
+        RBinReloc *br;
+        r_rbtree_foreach (relocs, iter, br, RBinReloc, vrb) {
             RelocDescription reloc;
 
             reloc.vaddr = br->vaddr;