[Libreoffice-commits] core.git: 2 commits - filter/qa include/tools tools/source unusedcode.easy

Caolán McNamara caolanm at redhat.com
Tue Aug 27 02:31:27 PDT 2013


 filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff |binary
 include/tools/string.hxx                              |    1 -
 tools/source/string/tustring.cxx                      |   16 ----------------
 unusedcode.easy                                       |    1 -
 4 files changed, 18 deletions(-)

New commits:
commit b3b842723518b5c7c6ea86465fe00eed754652f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 27 10:29:31 2013 +0100

    test case for CVE-2013-5575/EDB-27875
    
    Change-Id: I43214c3ec840274f120730c1f80ef693859ddae7

diff --git a/filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff b/filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff
new file mode 100644
index 0000000..ae3cee1
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff differ
commit a720ff09d8ee03248865599a691314199925dbf8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 27 10:01:19 2013 +0100

    Related: fdo#38838 AllocBuffer is now unused
    
    Change-Id: Ib2cf99f3dd9ce5e3acc7364d07d6b6e5d03de423

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index b70d988..7b8793c 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -276,7 +276,6 @@ public:
     const sal_Unicode*  GetBuffer() const { return mpData->maStr; }
     sal_Unicode*        GetBufferAccess();
     void                ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
-    sal_Unicode*        AllocBuffer( xub_StrLen nLen );
 
     friend sal_Bool     operator == ( const UniString& rStr1,   const UniString& rStr2 )
                             { return rStr1.Equals( rStr2 ); }
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 6487eb7..839603e 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -265,22 +265,6 @@ void STRING::ReleaseBufferAccess( xub_StrLen nLen )
         mpData->mnLen = nLen;
 }
 
-STRCODE* STRING::AllocBuffer( xub_StrLen nLen )
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    STRING_RELEASE((STRING_TYPE *)mpData);
-    if ( nLen )
-        mpData = ImplAllocData( nLen );
-    else
-    {
-        mpData = NULL;
-        STRING_NEW((STRING_TYPE **)&mpData);
-    }
-
-    return mpData->maStr;
-}
-
 STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index fcf2686..031fdf3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -77,7 +77,6 @@ SmFontPickList::Contains(Font const&) const
 StatusBar::CopyItems(StatusBar const&)
 StatusBar::HideItems()
 StatusBar::ShowItems()
-String::AllocBuffer(unsigned short)
 SvFileStream::GetFileHandle() const
 SvdProgressInfo::ReportError()
 SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)


More information about the Libreoffice-commits mailing list