[Libreoffice-commits] .: svtools/source

Petr Mladek pmladek at kemper.freedesktop.org
Fri Mar 18 05:50:35 PDT 2011


 svtools/source/svhtml/parhtml.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95e301d0a55b8145ce0cdb037e438bbcfcd4a4eb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Mar 18 13:49:28 2011 +0100

    slightly updated fix for import problems with unsupported HTML tag (fdo#34666)

diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 81e1273..7cd8dfb 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1253,10 +1253,10 @@ int HTMLParser::_GetNextToken()
                     {
                         ScanText( '>' );
 
-                        // #i34666# closing "/>"?:
+                        // fdo#34666: closing "/>"?:
                         // return HTML_UNKNOWNCONTROL_OFF instead of
                         // HTML_UNKNOWNCONTROL_ON
-                        if ('/' == aToken.GetChar(aToken.Len()-1)) {
+                        if (aToken.Len() >= 1 && '/' == aToken.GetChar(aToken.Len()-1)) {
                             if (HTML_UNKNOWNCONTROL_ON == nRet)
                                 nRet = HTML_UNKNOWNCONTROL_OFF;
                         }


More information about the Libreoffice-commits mailing list