From 04655aa3f16fe5f8d70a71b3fa6d9555cbc078c6 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Mon, 17 Dec 2018 15:45:56 -0500
Subject: [PATCH] state history plugin: permission_object bug #6495

---
 .../state_history_serialization.hpp              | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index b20f264598e..b000ac78803 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -325,10 +325,20 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
    fc::raw::pack(ds, fc::unsigned_int(0));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.value));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
-   if (obj.obj.parent._id)
-      fc::raw::pack(ds, as_type<uint64_t>(obj.db.get<eosio::chain::permission_object>(obj.obj.parent).name.value));
-   else
+   if (obj.obj.parent._id) {
+      auto&       index  = obj.db.get_index<eosio::chain::permission_index>();
+      const auto* parent = index.find(obj.obj.parent);
+      if (!parent) {
+         auto& undo = index.stack().back();
+         auto  it   = undo.removed_values.find(obj.obj.parent);
+         EOS_ASSERT(it != undo.removed_values.end(), eosio::chain::plugin_exception,
+                    "can not find parent of permission_object");
+         parent = &it->second;
+      }
+      fc::raw::pack(ds, as_type<uint64_t>(parent->name.value));
+   } else {
       fc::raw::pack(ds, as_type<uint64_t>(0));
+   }
    fc::raw::pack(ds, as_type<fc::time_point>(obj.obj.last_updated));
    fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::shared_authority>(obj.obj.auth)));
    return ds;