[Libreoffice-commits] .: filter/source vcl/source

[Libreoffice Gerrit user]

 filter/source/pdf/impdialog.cxx    |    4 ----
 vcl/source/gdi/pdfwriter_impl2.cxx |    3 ---
 2 files changed, 7 deletions(-)

New commits:
commit 34091bc0e33a0aa6e839f5474e53d22a79960e68
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 27 20:36:23 2012 +0100

    drop these memory trashers
    
    some are the wrong length anyway, and anyway the copies remain untrashed,
    and munging immutable strings is dubious
    
    Change-Id: Ic7ac3bea35e57ed015092b3b255d48819195490d

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8330730..d19c87e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1317,10 +1317,6 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
         }
         else
             maPreparedOwnerPassword = Sequence< NamedValue >();
-
-        // trash clear text passwords string memory
-        memset( (void*)aUserPW.getStr(), 0, aUserPW.getLength() );
-        memset( (void*)aOwnerPW.getStr(), 0, aOwnerPW.getLength() );
     }
     enablePermissionControls();
     return 0;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 16f806b..1855d43 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1315,9 +1315,6 @@ void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_
     sal_Int32 i,y;
     for( i = nCurrentChar, y = 0 ; i < ENCRYPTED_PWD_SIZE; i++, y++ )
         o_pPaddedPW[i] = s_nPadString[y];
-
-    // trash memory of temporary clear text password
-    memset( (sal_Char*)aString.getStr(), 0, aString.getLength() );
 }
 
 /**********************************