diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:00:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:00:07 +0000 |
| commit | 66f6a85c90b2778eeea4a5e2e9425788ec3f0f8d (patch) | |
| tree | e6fdca50018f7c58d60069f1675d80e41fe81423 /sc/source/filter/excel/tokstack.cxx | |
| parent | 821eec05d10b76b471026967fdd314cec4da6a04 (diff) | |
INTEGRATION: CWS dr42 (1.7.16); FILE MERGED
2005/10/05 14:43:52 dr 1.7.16.2: #b6332843# corrected array usage...
2005/10/05 12:53:42 dr 1.7.16.1: #b6332843# crash in token pool
Diffstat (limited to 'sc/source/filter/excel/tokstack.cxx')
| -rw-r--r-- | sc/source/filter/excel/tokstack.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 0e248daecf43..c7bf521edee7 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tokstack.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-10-21 11:56:10 $ + * last change: $Author: hr $ $Date: 2005-10-25 11:00:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -262,6 +262,7 @@ void TokenPool::GrowExt( void ) EXTCONT** ppNew = new EXTCONT*[ nNewSize ]; + memset( ppNew, 0, sizeof( EXTCONT* ) * nNewSize ); memcpy( ppNew, ppP_Ext, sizeof( EXTCONT* ) * nP_Ext ); delete[] ppP_Ext; @@ -276,10 +277,11 @@ void TokenPool::GrowNlf( void ) NLFCONT** ppNew = new NLFCONT*[ nNewSize ]; + memset( ppNew, 0, sizeof( NLFCONT* ) * nNewSize ); memcpy( ppNew, ppP_Nlf, sizeof( NLFCONT* ) * nP_Nlf ); delete[] ppP_Nlf; - ppNew = ppP_Nlf; + ppP_Nlf = ppNew; nP_Nlf = nNewSize; } |