From 83fe535888e3ab07c3ca844eb90dce172ca791d2 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 24 Sep 2020 15:16:44 +0000 Subject: [PATCH] fix a couple bugs found by OSS-fuzz - index out of bounds when importing outputs - accessing invalid CLSAG data --- src/ringct/rctTypes.h | 6 ++++++ src/wallet/wallet2.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/ringct/rctTypes.h b/src/ringct/rctTypes.h index c80fc0dba..bb3c07524 100644 --- a/src/ringct/rctTypes.h +++ b/src/ringct/rctTypes.h @@ -372,6 +372,12 @@ namespace rct { template class Archive> bool serialize_rctsig_prunable(Archive &ar, uint8_t type, size_t inputs, size_t outputs, size_t mixin) { + if (inputs >= 0xffffffff) + return false; + if (outputs >= 0xffffffff) + return false; + if (mixin >= 0xffffffff) + return false; if (type == RCTTypeNull) return ar.stream().good(); if (type != RCTTypeFull && type != RCTTypeSimple && type != RCTTypeBulletproof && type != RCTTypeBulletproof2 && type != RCTTypeFullBulletproof && type != RCTTypeSimpleBulletproof && type != RCTTypeCLSAG) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 7f2d6ae4a..6bced88a2 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -13031,6 +13031,8 @@ process: crypto::public_key tx_pub_key = get_tx_pub_key_from_received_outs(td); const std::vector additional_tx_pub_keys = get_additional_tx_pub_keys_from_extra(td.m_tx); + THROW_WALLET_EXCEPTION_IF(td.m_internal_output_index >= td.m_tx.vout.size(), + error::wallet_internal_error, "Internal index is out of range"); THROW_WALLET_EXCEPTION_IF(td.m_tx.vout[td.m_internal_output_index].target.type() != typeid(cryptonote::txout_to_key), error::wallet_internal_error, "Unsupported output type"); const crypto::public_key& out_key = boost::get(td.m_tx.vout[td.m_internal_output_index].target).key;