diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-24 16:18:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-24 16:33:14 +0100 |
| commit | d94f3a68f77de906abd576c7e2f31e0a8586d154 (patch) | |
| tree | 0c939eb05d40d11a2d7b55551c974fd3d05c87f9 /xmlhelp | |
| parent | 3617e1a37f7f77eb4d57ca455fca9507f1a15872 (diff) | |
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
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
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 ); |