diff options
| author | PriyankaGaikwad <priyanka.gaikwad@synerzip.com> | 2014-02-19 17:08:02 +0530 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 15:21:51 -0600 |
| commit | 0b6a1f2afa7954afcf1f27b066169455ed6cff7a (patch) | |
| tree | 40c78c75d9bfd367787ea35a89967a2cb9ee3204 /oox/source/helper | |
| parent | e059218a83ddb5c0e3d5b4ae0ca932d281683edf (diff) | |
fdo#75200:Libreoffice crash while opening the file
Conflicts:
chart2/qa/extras/chart2import.cxx
Change-Id: Icb2a5bc43ef5fd0f307b43bbe8aaf892a043dc5b
Reviewed-on: https://gerrit.libreoffice.org/8127
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox/source/helper')
| -rw-r--r-- | oox/source/helper/propertymap.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index ab37dd3856b0..cd84da0e4af5 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -243,8 +243,11 @@ void PropertyMap::fillSequences( Sequence< OUString >& rNames, Sequence< Any >& for( const_iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt, ++pNames, ++pValues ) { OSL_ENSURE( (0 <= aIt->first) && (aIt->first < PROP_COUNT), "PropertyMap::fillSequences - invalid property identifier" ); - *pNames = (*mpPropNames)[ aIt->first ]; - *pValues = aIt->second; + if((sal_uInt32)aIt->first <= mpPropNames->size()) + { + *pNames = (*mpPropNames)[ aIt->first ]; + *pValues = aIt->second; + } } } } |