From f20feba4c43c34fd2ee05b4658b0de0248c08eb9 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 14 Oct 2013 14:55:23 +0200
Subject: resolved fdo#70319 exponent must be followed by at least one digit

Change-Id: Icdd22fa0f1efcdd18cfea7cb48e1cbf2cf8d3533
---
 sal/rtl/math.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sal/rtl/math.cxx')

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 590ea0ee46b0..f66039a4a3ad 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -799,6 +799,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
         // Exponent
         if (p != p0 && p != pEnd && (*p == CharT('E') || *p == CharT('e')))
         {
+            CharT const * const pExponent = p;
             ++p;
             bool bExpSign;
             if (p != pEnd && *p == CharT('-'))
@@ -812,6 +813,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
                 if (p != pEnd && *p == CharT('+'))
                     ++p;
             }
+            CharT const * const pFirstExpDigit = p;
             if ( fVal == 0.0 )
             {   // no matter what follows, zero stays zero, but carry on the
                 // offset
@@ -857,6 +859,10 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
                     else
                         fVal = rtl::math::pow10Exp( fVal, nExp );  // normal
                 }
+                else if (p == pFirstExpDigit)
+                {   // no digits in exponent, reset end of scan
+                    p = pExponent;
+                }
             }
         }
         else if (p - p0 == 2 && p != pEnd && p[0] == CharT('#')
-- 
cgit