diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-04 10:00:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-04 15:19:44 +0100 |
| commit | 10d642580d1fa2eb3450a0323c9f1338b170ccee (patch) | |
| tree | 7cc2d8f3069f838efd61dbf57822fb8aa58d823d | |
| parent | 0bd9ba0110b815abc375caf4ae0d5c91b90ae0c5 (diff) | |
ofz#4947 Integer-overflow
Change-Id: I7573f2d211bf9d676c436fcc2e7b312177fa377f
Reviewed-on: https://gerrit.libreoffice.org/47375
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index a1d6ee966d87..392e02addbc0 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1017,10 +1017,18 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr, break; case CSS1_PIXLENGTH: { - long nPWidth = 0; - long nPHeight = (long)pExpr->GetNumber(); - SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nHeight = (sal_uLong)nPHeight; + double fHeight = pExpr->GetNumber(); + if (fHeight < SAL_MAX_INT32/2.0 && fHeight > SAL_MIN_INT32/2.0) + { + long nPHeight = (long)fHeight; + long nPWidth = 0; + SvxCSS1Parser::PixelToTwip(nPWidth, nPHeight); + nHeight = (sal_uLong)nPHeight; + } + else + { + SAL_WARN("sw.html", "out-of-size pxlength: " << fHeight); + } } break; case CSS1_PERCENTAGE: |