From d94f3a68f77de906abd576c7e2f31e0a8586d154 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 24 Oct 2013 16:18:41 +0100
Subject: 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
---
 xmlhelp/source/cxxhelp/provider/databases.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index dd97078b56f9..d9cd7aef7f92 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -746,15 +746,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 );
-- 
cgit