[ObjectHandler-cvs] ObjectHandler/xlsdk framewrk.cpp,1.3,1.4
Brought to you by:
ericehlers,
nando
From: Eric E. <eri...@us...> - 2006-07-11 12:33:29
|
Update of /cvsroot/objecthandler/ObjectHandler/xlsdk In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4226/xlsdk Modified Files: framewrk.cpp Log Message: modify GetTempMemory() to throw rather than return 0 on error Index: framewrk.cpp =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/xlsdk/framewrk.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** framewrk.cpp 2 Jun 2006 13:58:09 -0000 1.3 --- framewrk.cpp 11 Jul 2006 12:33:26 -0000 1.4 *************** *** 57,61 **** if (vOffsetMemBlock + cBytes > MEMORYSIZE) { ! return 0; } else --- 57,62 ---- if (vOffsetMemBlock + cBytes > MEMORYSIZE) { ! //return 0; ! throw std::exception("buffer overflow"); } else *************** *** 145,152 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } lpx->xltype = xltypeNum; --- 146,153 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} lpx->xltype = xltypeNum; *************** *** 226,233 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } lpx->xltype = xltypeStr; --- 227,234 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} lpx->xltype = xltypeStr; *************** *** 242,253 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } int len = __min(255, s.length()); lpx->xltype = xltypeStr; lpx->val.str = GetTempMemory(len + 1); ! if (!lpx->val.str) return 0; strncpy(lpx->val.str + 1, s.c_str(), len); lpx->val.str[0] = (BYTE) len; --- 243,254 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} int len = __min(255, s.length()); lpx->xltype = xltypeStr; lpx->val.str = GetTempMemory(len + 1); ! //if (!lpx->val.str) return 0; strncpy(lpx->val.str + 1, s.c_str(), len); lpx->val.str[0] = (BYTE) len; *************** *** 281,288 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } lpx->xltype = xltypeBool; --- 282,289 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} lpx->xltype = xltypeBool; *************** *** 318,325 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } lpx->xltype = xltypeInt; --- 319,326 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} lpx->xltype = xltypeInt; *************** *** 358,365 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } lpx->xltype = xltypeErr; --- 359,366 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} lpx->xltype = xltypeErr; *************** *** 541,548 **** lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! if (!lpx) ! { ! return 0; ! } lpx->xltype = xltypeMissing; --- 542,549 ---- lpx = (LPXLOPER) GetTempMemory(sizeof(XLOPER)); ! //if (!lpx) ! //{ ! // return 0; ! //} lpx->xltype = xltypeMissing; |