Merge pull request #1563 from jagerman/empty-tx-warnings

Empty tx warnings

src/blockchain_db/lmdb/db_lmdb.cpp

@@ -1998,6 +1998,9 @@ bool BlockchainLMDB::get_txpool_tx_blob(const crypto::hash& txid, std::string &b
   if (result != 0)
       throw1(DB_ERROR(lmdb_error("Error finding txpool tx blob: ", result).c_str()));
 
+  if (v.mv_size == 0)
+      throw1(DB_ERROR("Error finding txpool tx blob: tx is present, but data is empty"));
+
   bd.assign(reinterpret_cast<const char*>(v.mv_data), v.mv_size);
   return true;
 }

src/cryptonote_core/cryptonote_core.cpp

@@ -1120,6 +1120,12 @@ namespace cryptonote
       tx_info.tvc.m_too_big = true;
       return;
     }
+    else if (tx_info.blob->empty())
+    {
+      LOG_PRINT_L1("WRONG TRANSACTION BLOB, blob is empty, rejected");
+      tx_info.tvc.m_verifivation_failed = true;
+      return;
+    }
 
     tx_info.parsed = parse_and_validate_tx_from_blob(*tx_info.blob, tx_info.tx, tx_info.tx_hash);
     if(!tx_info.parsed)

src/cryptonote_protocol/cryptonote_protocol_handler.inl

@@ -2579,17 +2579,15 @@ skip:
   template<class t_core>
   bool t_cryptonote_protocol_handler<t_core>::relay_transactions(NOTIFY_NEW_TRANSACTIONS::request& arg, cryptonote_connection_context& exclude_context)
   {
-    for(auto& tx_blob : arg.txs)
-      m_core.on_transaction_relayed(tx_blob);
-
     // no check for success, so tell core they're relayed unconditionally and snag a copy of the
     // hash so that we can look up any associated blink data we should include.
     std::vector<crypto::hash> relayed_txes;
     relayed_txes.reserve(arg.txs.size());
     for (auto &tx_blob : arg.txs)
-      relayed_txes.push_back(
-          m_core.on_transaction_relayed(tx_blob)
-      );
+    {
+      if (auto hash = m_core.on_transaction_relayed(tx_blob))
+        relayed_txes.push_back(hash);
+    }
 
     // Rebuild arg.blinks from blink data that we have because we don't necessarily have the same
     // blink data that got sent to us (we may have additional blink info, or may have rejected some