[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmlhelp/source

[Caolán McNamara]

 xmlhelp/source/cxxhelp/provider/databases.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 5c635c7773da618ad948c8b595deba53f8653cf9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 16:18:41 2013 +0100

    pEmpty is completely insane to use
    
    DbtToStringConverter protects against a NULL pointer, but not a
    pointer to the too short data that pEmpty provides
    
    Change-Id: I5d21e852ce0373eff7d3627e266b9cbc77f5dd09
    (cherry picked from commit d94f3a68f77de906abd576c7e2f31e0a8586d154)
    Reviewed-on: https://gerrit.libreoffice.org/6421
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 447d1e0..331aa20 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -762,15 +762,13 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
     listAnchor.realloc( id.size() );
     listTitle.realloc( id.size() );
 
-    const sal_Char* pData = NULL;
-    const sal_Char pEmpty[] = "";
-
     for( sal_uInt32 i = 0; i < id.size(); ++i )
     {
         listId[i] = id[i];
         listAnchor[i] = anchor[i];
 
-        pData = pEmpty;
+        const sal_Char* pData = NULL;
+
         if( pHdf )
         {
             OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 );