summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-09-13 09:42:01 +0200
committerAndras Timar <andras.timar@collabora.com>2015-09-19 21:32:13 +0200
commit4b53899d15b21d524648f485d758883623cee993 (patch)
treed6dc87cf3893a513301ea81ecea6267cb8726925
parenttdf#92145: Writer table rows/columns can't be resized (diff)
downloadcore-4b53899d15b21d524648f485d758883623cee993.tar.gz
core-4b53899d15b21d524648f485d758883623cee993.zip
cppcheck: Mismatching allocation and deallocation
+ Typo: excecptionTypeSizeArray->exceptionTypeSizeArray Cherry-picked from 81d62c5f48f3bf341c4c7bdaef5a5ce5941f3e62 Change-Id: I6fac3bea1eba094e87717d20a08ec7cf6151e2df Reviewed-on: https://gerrit.libreoffice.org/18527 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index f95a04589987..321a16860f9c 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -609,8 +609,8 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
// 2.Pass: Get the total needed memory for class ExceptionType
// (with embedded type_info) and keep the sizes for each instance
- // is stored in alloced int array
- int *excecptionTypeSizeArray = new int[nLen];
+ // is stored in allocated int array
+ int *exceptionTypeSizeArray = new int[nLen];
nLen = 0;
for (pCompTD = (typelib_CompoundTypeDescription*)pTD;
@@ -625,14 +625,14 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
n++;
typeInfoLen = n*4;
}
- excecptionTypeSizeArray[nLen++] = typeInfoLen + sizeof(ExceptionType);
+ exceptionTypeSizeArray[nLen++] = typeInfoLen + sizeof(ExceptionType);
}
// Total ExceptionType related mem
int excTypeAddLen = 0;
for (int i = 0; i < nLen; i++)
{
- excTypeAddLen += excecptionTypeSizeArray[i];
+ excTypeAddLen += exceptionTypeSizeArray[i];
}
// Allocate mem for code and all dynamic data in one chunk to guarantee
@@ -684,7 +684,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
// Next trampoline entry offset
pCodeOffset += codeSnippetSize;
// Next ExceptionType placement offset
- etMemOffset += excecptionTypeSizeArray[nPos - 1];
+ etMemOffset += exceptionTypeSizeArray[nPos - 1];
// Keep offset of addresses of ET for D-Tor call in ~RaiseInfo
types[nPos++]
@@ -694,7 +694,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
assert(etMem + etMemOffset == pCode + totalSize);
// remove array
- delete excecptionTypeSizeArray;
+ delete[] exceptionTypeSizeArray;
}
RaiseInfo::~RaiseInfo() throw ()