Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-12 10:50:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3187

Browse source 
851bd057 call _exit instead of abort in release mode (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:20:31 +01:00
commit 666a76652b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
6 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/crypto/crypto.cpp
View file

@ -28,6 +28,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include <unistd.h>
#include <cassert>
#include <cstddef>
#include <cstdint>
@ -43,6 +44,18 @@
#include "crypto.h"
#include "hash.h"
namespace {
static void local_abort(const char *msg)
{
fprintf(stderr, "%s\n", msg);
#ifdef NDEBUG
_exit(1);
#else
abort();
#endif
}
}
namespace crypto {
using std::abort;
@ -467,7 +480,7 @@ POP_WARNINGS
ec_scalar sum, k, h;
boost::shared_ptr<rs_comm> buf(reinterpret_cast<rs_comm *>(malloc(rs_comm_size(pubs_count))), free);
if (!buf)
abort();
local_abort("malloc failure");
assert(sec_index < pubs_count);
#if !defined(NDEBUG)
{
@ -486,7 +499,7 @@ POP_WARNINGS
}
#endif
if (ge_frombytes_vartime(&image_unp, &image) != 0) {
abort();
local_abort("invalid key image");
}
ge_dsm_precomp(image_pre, &image_unp);
sc_0(&sum);
@ -505,7 +518,7 @@ POP_WARNINGS
random_scalar(sig[i].c);
random_scalar(sig[i].r);
if (ge_frombytes_vartime(&tmp3, &*pubs[i]) != 0) {
abort();
local_abort("invalid pubkey");
}
ge_double_scalarmult_base_vartime(&tmp2, &sig[i].c, &tmp3, &sig[i].r);
ge_tobytes(&buf->ab[i].a, &tmp2);