diff options
| author | Sam Tygier <samtygier@yahoo.co.uk> | 2016-05-22 19:51:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-02 10:34:00 +0000 |
| commit | e687739eb4849014f7f2657e94d8ab67e4d74625 (patch) | |
| tree | 9463ec5496e14b5081faa0ef44b82468be38fcfc | |
| parent | 1245bead3a68c9495a870f194f3c523b3b78cf87 (diff) | |
tdf#99994 Avoid invalid access by reusing getFontFamily() result
getFontFamily() can give a different result on the second call so in
order to protect against access to an invalid element of the vector
the result must be reused.
Change-Id: Iec7d58537263cb5c8a7c2ea95761dd929d659e01
Reviewed-on: https://gerrit.libreoffice.org/25704
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Xisco Faulí <anistenis@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/25796
Reviewed-by: Mark Page <aptitude@btconnect.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | svgio/source/svgreader/svgcharacternode.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 855beaa32954..8951c3117cac 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -238,9 +238,10 @@ namespace svgio if(nLength) { // prepare FontAttribute - OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ? + const SvgStringVector& rFontFamilyVector = rSvgStyleAttributes.getFontFamily(); + OUString aFontFamily = rFontFamilyVector.empty() ? OUString("Times New Roman") : - rSvgStyleAttributes.getFontFamily()[0]; + rFontFamilyVector[0]; // #i122324# if the FontFamily name ends on ' embedded' it is probably a re-import // of a SVG export with font embedding. Remove this to make font matching work. This |