[Libreoffice-commits] core.git: sdext/source

[Mike]

 sdext/source/pdfimport/pdfparse/pdfparse.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa4071bb522d7aad069ca24bafedb597455e95b0
Author: Mike <mikekaganski at hotmail.com>
Date:   Wed Apr 29 02:30:46 2015 +1000

    tdf#63054: pdf_string_parser incorrectly handles escapes
    
    This patch fixes the escapes handling by avoiding boost built-in
    functions that skip whitespaces behind the scenes.
    
    Change-Id: I9607ecd9e2e052aadcba69cf30ec25c981743c49
    Reviewed-on: https://gerrit.libreoffice.org/15562
    Tested-by: Jenkins <ci at libreoffice.org>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 6419040..7600d3c 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -116,8 +116,8 @@ public:
                 else if( c == '\\' ) // ignore escaped braces
                 {
                     ++len;
-                    ++scan;
-                    if( scan.at_end() )
+                    ++scan.first;                 // tdf#63054: avoid skipping spaces
+                    if( scan.first == scan.last ) // tdf#63054: avoid skipping spaces
                         break;
                 }
                 ++len;