diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-01-26 10:35:13 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-02-01 13:32:46 +0000 |
| commit | 851bd057ecfa2997252429f86362b0a710a1af8d (patch) | |
| tree | ee07556385050124c85bcc76fea1cb1b81da65c5 /src/crypto/crypto.cpp | |
| parent | Merge pull request #3130 (diff) | |
| download | monero-851bd057ecfa2997252429f86362b0a710a1af8d.tar.xz | |
call _exit instead of abort in release mode
Avoids cores being created, as they're nowadays often piped
to some call home system
Diffstat (limited to '')
| -rw-r--r-- | src/crypto/crypto.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp index 95ba34828..10ef25ec7 100644 --- a/src/crypto/crypto.cpp +++ b/src/crypto/crypto.cpp @@ -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); |