From 713faeb022b99e6caeb6452cf294aead0cbf0966 Mon Sep 17 00:00:00 2001 From: fwcd Date: Sat, 6 Apr 2019 21:33:50 +0200 Subject: [PATCH] Remove unused allocation code --- src/CalcManager/Ratpack/conv.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/CalcManager/Ratpack/conv.cpp b/src/CalcManager/Ratpack/conv.cpp index 0da3c426..c5c273c5 100644 --- a/src/CalcManager/Ratpack/conv.cpp +++ b/src/CalcManager/Ratpack/conv.cpp @@ -207,25 +207,16 @@ PNUMBER _createnum( _In_ uint32_t size ) { PNUMBER pnumret= nullptr; - uint32_t cbAlloc; - - if (SUCCEEDED(Calc_ULongAdd(cbAlloc, sizeof(NUMBER), &cbAlloc))) + try { - try - { - pnumret = new NUMBER(); - } - catch (const bad_alloc&) - { - throw( CALC_E_OUTOFMEMORY ); - } - // Fill mantissa vector with zeros - pnumret->mant.insert(pnumret->mant.end(), size, 0); + pnumret = new NUMBER(); } - else + catch (const bad_alloc&) { - throw( CALC_E_INVALIDRANGE ); + throw( CALC_E_OUTOFMEMORY ); } + // Fill mantissa vector with zeros + pnumret->mant.insert(pnumret->mant.end(), size, 0); return( pnumret ); }