From d224c0e7d8b29f0552d00b45c5555d0aa2a51a24 Mon Sep 17 00:00:00 2001 From: XMRig Date: Thu, 28 Nov 2019 05:14:17 +0700 Subject: [PATCH] Minor changes, based on https://github.com/xmrig/xmrig-nvidia/pull/305 --- src/base/api/Api.cpp | 4 ++-- src/base/tools/Arguments.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/base/api/Api.cpp b/src/base/api/Api.cpp index 22f00b77..ad44bbb3 100644 --- a/src/base/api/Api.cpp +++ b/src/base/api/Api.cpp @@ -179,13 +179,13 @@ void xmrig::Api::genId(const String &id) if (!interfaces[i].is_internal && interfaces[i].address.address4.sin_family == AF_INET) { uint8_t hash[200]; const size_t addrSize = sizeof(interfaces[i].phys_addr); - const size_t inSize = strlen(APP_KIND) + addrSize + sizeof(uint16_t); + const size_t inSize = (sizeof(APP_KIND) - 1) + addrSize + sizeof(uint16_t); const uint16_t port = static_cast(m_base->config()->http().port()); uint8_t *input = new uint8_t[inSize](); memcpy(input, &port, sizeof(uint16_t)); memcpy(input + sizeof(uint16_t), interfaces[i].phys_addr, addrSize); - memcpy(input + sizeof(uint16_t) + addrSize, APP_KIND, strlen(APP_KIND)); + memcpy(input + sizeof(uint16_t) + addrSize, APP_KIND, (sizeof(APP_KIND) - 1)); keccak(input, inSize, hash); Buffer::toHex(hash, 8, m_id); diff --git a/src/base/tools/Arguments.cpp b/src/base/tools/Arguments.cpp index 3713dd11..933173aa 100644 --- a/src/base/tools/Arguments.cpp +++ b/src/base/tools/Arguments.cpp @@ -60,17 +60,17 @@ void xmrig::Arguments::add(const char *arg) const size_t size = strlen(arg); if (size > 4 && arg[0] == '-' && arg[1] == '-') { - const char *p = strstr(arg, "="); + const char *p = strchr(arg, '='); if (p) { - const size_t keySize = static_cast(p - arg); + const auto keySize = static_cast(p - arg); - m_data.push_back(String(arg, keySize)); - m_data.push_back(arg + keySize + 1); + m_data.emplace_back(arg, keySize); + m_data.emplace_back(arg + keySize + 1); return; } } - m_data.push_back(arg); + m_data.emplace_back(arg); }