summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike <mikekaganski@hotmail.com>2015-04-29 02:30:46 +1000
committerDavid Tardon <dtardon@redhat.com>2015-04-29 07:43:19 +0000
commitfa4071bb522d7aad069ca24bafedb597455e95b0 (patch)
treea5b9211dd5ba2091d5a5f3f38c11b068d33e69f0
parenta2c02f3f0d929e908a9e5fe91c808676b95036bd (diff)
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@libreoffice.org> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 6419040d8bd7..7600d3c6a6d9 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;