From 5f1043dab5435ae036bcbca288ca5c55d4bd930f Mon Sep 17 00:00:00 2001 From: Karthik Godha Date: Thu, 6 Nov 2025 18:35:51 +0530 Subject: [PATCH] tdf#168843: Sanitize font size read from PPT Add validation checks for font size when importing a PPT. Minimum accepted value for font size is 100. Change-Id: I0c00705eafde1befe459cf8ba52ce32b1dbfbd5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193539 Reviewed-by: Michael Stahl Tested-by: Jenkins CollaboraOffice (cherry picked from commit 28273e586b398e2ce181c4ce9e740949fad11876) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194633 Code-Style: Xisco Fauli Reviewed-by: Xisco Fauli Tested-by: Jenkins --- filter/source/msfilter/svdfppt.cxx | 2 +- oox/source/export/drawingml.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d2f192bf9991..550975191557 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5591,7 +5591,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T } if ( GetAttrib( PPT_CharAttr_FontHeight, nVal, nDestinationInstance ) ) // Font size in Point { - constexpr sal_uInt32 MIN_FONT_HEIGHT_PT = 2; + constexpr sal_uInt32 MIN_FONT_HEIGHT_PT = 1; sal_uInt32 nHeight = rManager.ScalePoint(std::max(nVal, MIN_FONT_HEIGHT_PT)); rSet.Put( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) ); diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 7f503d3a6396..256e7ecdf600 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2685,7 +2685,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool } } - assert(nSize >= 200 && "Minimum accepted value for fontsize(ST_TextFontSize) is 200"); + assert(nSize >= 100 && "Minimum accepted value for fontsize(ST_TextFontSize) is 100"); mpFS->startElementNS( XML_a, nElement, XML_lang, sax_fastparser::UseIf(usLanguage, !usLanguage.isEmpty()),