Added patches to fix SEGV problem

See github.com/EOSIO/eos/pull/7437
eoscanada · May 30, 2019 · 2c73748 · 2c73748
1 parent b783f4a
commit 2c73748
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/cloudbuild-eos-dm.yaml b/cloudbuild-eos-dm.yaml
@@ -3,7 +3,7 @@ substitutions:
   _TAG: v1.8.0-rc2
   # Check available tags via `gcr.io/${PROJECT_ID}/eosio-buildenv` images
   _EOSIO_BUILDENV_TAG: v1.8.0-rc2
-  _PATCHES: "eos-deep-mind-v1.8.0-rc2-v10.1.patch eos-deep-mind-logging-v1.8.0-rc2-v10.1.patch"
+  _PATCHES: "eos-deep-mind-v1.8.0-rc2-v10.1.patch eos-deep-mind-logging-v1.8.0-rc2-v10.1.patch github.com-eosio-eos-91c7912b62eabbf0d42bebf6ecdbba009d15f5f9"
 
 steps:
 - id: docker-build-full

diff --git a/cloudbuild-eos-vanilla.yaml b/cloudbuild-eos-vanilla.yaml
@@ -3,7 +3,7 @@ substitutions:
   _TAG: v1.8.0-rc2
   # Check available tags via `gcr.io/${PROJECT_ID}/eosio-buildenv` images
   _EOSIO_BUILDENV_TAG: v1.8.0-rc2
-  _PATCHES: ""
+  _PATCHES: "github.com-eosio-eos-91c7912b62eabbf0d42bebf6ecdbba009d15f5f9"
 
 steps:
 - id: docker-eos-full

diff --git a/patches/github.com-eosio-eos-91c7912b62eabbf0d42bebf6ecdbba009d15f5f9.patch b/patches/github.com-eosio-eos-91c7912b62eabbf0d42bebf6ecdbba009d15f5f9.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
+index 044caa2757..ab9f5c8aa9 100644
+--- a/plugins/producer_plugin/producer_plugin.cpp
++++ b/plugins/producer_plugin/producer_plugin.cpp
+@@ -1493,7 +1493,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
+
+                   if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
+                   if( exhausted ) break;
+-                  const auto& trx = itr->second;
++                  const transaction_metadata_ptr trx = itr->second;
+                   auto category = calculate_transaction_category(trx);
+                   if (category == tx_category::EXPIRED ||
+                      (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty()))