diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-16 10:28:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-08-16 10:28:24 +0200 |
| commit | b90c9ecb132ad686275afafe506f8044719245ec (patch) | |
| tree | fc805f0c16b23faff1eb10b46da132e8c1951712 /src/bitcoinrpc.cpp | |
| parent | 0a76546ae973241259aa5019e0d27758f86ef891 (diff) | |
| parent | eb72eae304a7067eb568437c66c4d831b075dab9 (diff) | |
| download | bitcoin-b90c9ecb132ad686275afafe506f8044719245ec.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index c8248fa4fe..d49f898828 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto +// Copyright (c) 2011 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. @@ -1187,7 +1188,8 @@ Value listtransactions(const Array& params, bool fHelp) // Now: iterate backwards until we have nCount items to return: TxItems::reverse_iterator it = txByTime.rbegin(); - for (std::advance(it, nFrom); it != txByTime.rend(); ++it) + if (txByTime.size() > nFrom) std::advance(it, nFrom); + for (; it != txByTime.rend(); ++it) { CWalletTx *const pwtx = (*it).second.first; if (pwtx != 0) |