From d5e7b611736e088801c1d269dfadd2270703bf58 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Mon, 20 Aug 2012 14:06:27 -0400 Subject: [PATCH] When using SIGHASH_SINGLE, do not sign inputs that have no corresponding outputs. This fixes issue #1688 --- src/rpcrawtransaction.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 57cba15ecff..56a49fd4d3c 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -428,6 +428,8 @@ Value signrawtransaction(const Array& params, bool fHelp) throw JSONRPCError(-8, "Invalid sighash param"); } + bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE); + // Sign what we can: for (unsigned int i = 0; i < mergedTx.vin.size(); i++) { @@ -440,7 +442,9 @@ Value signrawtransaction(const Array& params, bool fHelp) const CScript& prevPubKey = mapPrevOut[txin.prevout]; txin.scriptSig.clear(); - SignSignature(keystore, prevPubKey, mergedTx, i, nHashType); + // Only sign SIGHASH_SINGLE if there's a corresponding output: + if (!fHashSingle || (i < mergedTx.vout.size())) + SignSignature(keystore, prevPubKey, mergedTx, i, nHashType); // ... and merge in other signatures: BOOST_FOREACH(const CTransaction& txv, txVariants)