[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svtools/source

Caolán McNamara caolanm at redhat.com
Thu Jun 19 02:29:45 PDT 2014


 svtools/source/contnr/imivctl2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a3fe589d03720148a9389f6c826350b18b78672
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 19 09:01:56 2014 +0100

    sizeof(bool) is not required to be 1
    
    (cherry picked from commit 3daec14fd62a6a1655813d26e470513237129263)
    
    Conflicts:
    	svtools/source/contnr/imivctl2.cxx
    
    Change-Id: I19ba4e27a4403d2c17d0bbf3f29c42e4745e4c41

diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index dda5d4e..6892cc1 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -579,7 +579,7 @@ void IcnGridMap_Impl::Create_Impl()
         _nGridCols += 50;
 
     _pGridMap = new bool[ _nGridRows * _nGridCols];
-    memset( (void*)_pGridMap, 0, _nGridRows * _nGridCols );
+    memset( _pGridMap, 0, _nGridRows * _nGridCols * sizeof(bool) );
 
     const size_t nCount = _pView->aEntries.size();
     for( size_t nCur=0; nCur < nCount; nCur++ )


More information about the Libreoffice-commits mailing list