From 3525ea52ab101ee2e39992848d3dc25e24eb097f Mon Sep 17 00:00:00 2001 From: Javier Smooth Date: Sat, 26 Sep 2015 00:57:17 -0700 Subject: [PATCH 1/3] Cleanup: remove unused declaration (credit tewinget/Monero) --- src/cryptonote_core/blockchain_storage.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cryptonote_core/blockchain_storage.h b/src/cryptonote_core/blockchain_storage.h index 85c24fd..b5888a3 100644 --- a/src/cryptonote_core/blockchain_storage.h +++ b/src/cryptonote_core/blockchain_storage.h @@ -122,7 +122,6 @@ namespace cryptonote bool find_blockchain_supplement(const std::list& qblock_ids, uint64_t& starter_offset); bool find_blockchain_supplement(const uint64_t req_start_block, const std::list& qblock_ids, std::list > >& blocks, uint64_t& total_height, uint64_t& start_height, size_t max_count); bool handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NOTIFY_RESPONSE_GET_OBJECTS::request& rsp); - bool handle_get_objects(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res); bool get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res); bool get_backward_blocks_sizes(size_t from_height, std::vector& sz, size_t count); bool get_tx_outputs_gindexs(const crypto::hash& tx_id, std::vector& indexs); From a8f9a538e96d25fae783151d6c3bb991bf12bb11 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 9 Oct 2015 15:17:21 +0100 Subject: [PATCH 2/3] miniupnpc: quick fix for buffer overflow http://talosintel.com/reports/TALOS-2015-0035/ reported by palexander on IRC --- external/miniupnpc/igd_desc_parse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/external/miniupnpc/igd_desc_parse.c b/external/miniupnpc/igd_desc_parse.c index 6c3e656..80b552d 100755 --- a/external/miniupnpc/igd_desc_parse.c +++ b/external/miniupnpc/igd_desc_parse.c @@ -15,6 +15,10 @@ void IGDstartelt(void * d, const char * name, int l) { struct IGDdatas * datas = (struct IGDdatas *)d; + if (l >= MINIUPNPC_URL_MAXSIZE) { + printf("Attempt to exploit miniupnpc buffer overflow\n"); + l = MINIUPNPC_URL_MAXSIZE - 1; + } memcpy( datas->cureltname, name, l); datas->cureltname[l] = '\0'; datas->level++; From beafc79d0a09de845a9fd249e07aa41dd5719ad7 Mon Sep 17 00:00:00 2001 From: Javier Smooth Date: Fri, 9 Oct 2015 14:53:55 -0700 Subject: [PATCH 3/3] Version bump --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index e3ef645..dbe44a5 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,4 +1,4 @@ #define BUILD_COMMIT_ID "@VERSION@" -#define PROJECT_VERSION "0.9.4" +#define PROJECT_VERSION "0.9.5" #define PROJECT_VERSION_BUILD_NO "0" #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"