Fix segfault when accessing bad memory addresses

1 files changed, 1 insertions, 2 deletions

diff --git a/riscv/devices.h b/riscv/devices.h
index ba344db..0f0c916 100644
--- a/riscv/devices.h
+++ b/riscv/devices.h
@@ -20,8 +20,7 @@ class bus_t : public abstract_device_t {
   bool store(reg_t addr, size_t len, const uint8_t* bytes);
   void add_device(reg_t addr, abstract_device_t* dev);
 
-  struct descriptor { reg_t base; abstract_device_t* device; };
-  descriptor find_device(reg_t addr);
+  std::pair<reg_t, abstract_device_t*> find_device(reg_t addr);
 
  private:
   std::map<reg_t, abstract_device_t*> devices;