svgio/source/svgreader/svgcharacternode.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 68ccab350ca5b907f185c729e94a14df15fedc23 Author: Sam Tygier <[email protected]> Date: Sun May 22 19:51:53 2016 +0100 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 <[email protected]> Reviewed-by: Xisco Faulà <[email protected]> diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 1753f2d..2549190 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -236,9 +236,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
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
