[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4ce2d7e

The following commit has been merged in the master branch:
commit 4ce2d7e717d4a5e79f66acca6722a43bed561965
Author: vog <vog at notjusthosting.com>
Date:   Mon Jul 25 00:53:25 2011 +0000

    Improved error handling of nested documents at invalid positions, improved test cases
---
 src/epsimage.cpp                                   |  5 ++++
 ...-nested_minimal_begindocument-at-page-start.eps |  1 +
 ...ed_minimal_begindocument-before-page-start.eps} |  0
 ... eps-nested_minimal_begindocument-in-setup.eps} |  3 ++
 ..._minimal_includedocument-before-page-start.eps} |  2 --
 ...ps-nested_minimal_includedocument-in-setup.eps} |  2 ++
 test/data/eps/eps-test.out                         | 34 +++++++++++++++++++++-
 7 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index d043f50..0fb8658 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -539,6 +539,11 @@ namespace {
                 removableEmbeddings.back().second = pos;
             } else if (line == "%%EOF") {
                 posEof = startPos;
+            } else if (posPage == posEndEps && (startsWith(line, "%%IncludeDocument:") || startsWith(line, "%%BeginDocument:"))) {
+                #ifndef SUPPRESS_WARNINGS
+                EXV_WARNING << "Nested document at invalid position: " << startPos << "
";
+                #endif
+                throw Error(write ? 21 : 14);
             } else if (startsWith(line, "%%BeginDocument:")) {
                 // TODO: Add support for nested documents!
                 #ifndef SUPPRESS_WARNINGS
diff --git a/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps b/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps
index 57462d6..94a3079 100644
--- a/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps
+++ b/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps
@@ -1,5 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 5 5 105 105
+%%EndComments
 %%BeginDocument: dummy_document.eps
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 25 25 85 85
diff --git a/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps b/test/data/eps/eps-nested_minimal_begindocument-before-page-start.eps
similarity index 100%
copy from test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps
copy to test/data/eps/eps-nested_minimal_begindocument-before-page-start.eps
diff --git a/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps b/test/data/eps/eps-nested_minimal_begindocument-in-setup.eps
similarity index 89%
copy from test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps
copy to test/data/eps/eps-nested_minimal_begindocument-in-setup.eps
index 57462d6..527ae09 100644
--- a/test/data/eps/eps-nested_minimal_begindocument-at-page-start.eps
+++ b/test/data/eps/eps-nested_minimal_begindocument-in-setup.eps
@@ -1,5 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 5 5 105 105
+%%EndComments
+%%BeginSetup
 %%BeginDocument: dummy_document.eps
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 25 25 85 85
@@ -8,6 +10,7 @@
 0 40 rlineto 40 0 rlineto 0 -40 rlineto closepath
 stroke
 %%EndDocument
+%%EndSetup
 10 setlinewidth
 10 10 moveto
 0 90 rlineto 90 0 rlineto 0 -90 rlineto closepath
diff --git a/test/data/eps/eps-nested_minimal_includedocument.eps b/test/data/eps/eps-nested_minimal_includedocument-before-page-start.eps
similarity index 94%
copy from test/data/eps/eps-nested_minimal_includedocument.eps
copy to test/data/eps/eps-nested_minimal_includedocument-before-page-start.eps
index 727804a..287d9a7 100644
--- a/test/data/eps/eps-nested_minimal_includedocument.eps
+++ b/test/data/eps/eps-nested_minimal_includedocument-before-page-start.eps
@@ -1,9 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 5 5 105 105
 %%DocumentNeededResources: dummy_document.eps
-save
 %%IncludeDocument: dummy_document.eps
-restore
 10 setlinewidth
 10 10 moveto
 0 90 rlineto 90 0 rlineto 0 -90 rlineto closepath
diff --git a/test/data/eps/eps-nested_minimal_includedocument-at-page-start.eps b/test/data/eps/eps-nested_minimal_includedocument-in-setup.eps
similarity index 90%
copy from test/data/eps/eps-nested_minimal_includedocument-at-page-start.eps
copy to test/data/eps/eps-nested_minimal_includedocument-in-setup.eps
index 10f14c2..3e80c57 100644
--- a/test/data/eps/eps-nested_minimal_includedocument-at-page-start.eps
+++ b/test/data/eps/eps-nested_minimal_includedocument-in-setup.eps
@@ -2,7 +2,9 @@
 %%BoundingBox: 5 5 105 105
 %%DocumentNeededResources: dummy_document.eps
 %%EndComments
+%%BeginSetup
 %%IncludeDocument: dummy_document.eps
+%%EndSetup
 10 setlinewidth
 10 10 moveto
 0 90 rlineto 90 0 rlineto 0 -90 rlineto closepath
diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out
index 495faeb..9cf211b 100644
--- a/test/data/eps/eps-test.out
+++ b/test/data/eps/eps-test.out
@@ -3539,11 +3539,27 @@ Exit code: 0
 -----> eps-nested_minimal_begindocument-at-page-start.eps <-----
 
 Command: exiv2 -u -pa eps-nested_minimal_begindocument-at-page-start.eps
-Warning: Nested documents are currently not supported. Found nested document at position: 51
+Warning: Nested documents are currently not supported. Found nested document at position: 65
 Exiv2 exception in print action for file eps-nested_minimal_begindocument-at-page-start.eps:
 Failed to read image data
 Exit code: 1
 
+-----> eps-nested_minimal_begindocument-before-page-start.eps <-----
+
+Command: exiv2 -u -pa eps-nested_minimal_begindocument-before-page-start.eps
+Warning: Nested document at invalid position: 51
+Exiv2 exception in print action for file eps-nested_minimal_begindocument-before-page-start.eps:
+Failed to read image data
+Exit code: 1
+
+-----> eps-nested_minimal_begindocument-in-setup.eps <-----
+
+Command: exiv2 -u -pa eps-nested_minimal_begindocument-in-setup.eps
+Warning: Nested document at invalid position: 78
+Exiv2 exception in print action for file eps-nested_minimal_begindocument-in-setup.eps:
+Failed to read image data
+Exit code: 1
+
 -----> eps-nested_minimal_begindocument.eps <-----
 
 Command: exiv2 -u -pa eps-nested_minimal_begindocument.eps
@@ -3577,6 +3593,22 @@ Exit code: 0
 Command: exiv2 -f -ex eps-nested_minimal_includedocument-at-page-start.eps
 Exit code: 0
 
+-----> eps-nested_minimal_includedocument-before-page-start.eps <-----
+
+Command: exiv2 -u -pa eps-nested_minimal_includedocument-before-page-start.eps
+Warning: Nested document at invalid position: 97
+Exiv2 exception in print action for file eps-nested_minimal_includedocument-before-page-start.eps:
+Failed to read image data
+Exit code: 1
+
+-----> eps-nested_minimal_includedocument-in-setup.eps <-----
+
+Command: exiv2 -u -pa eps-nested_minimal_includedocument-in-setup.eps
+Warning: Nested document at invalid position: 124
+Exiv2 exception in print action for file eps-nested_minimal_includedocument-in-setup.eps:
+Failed to read image data
+Exit code: 1
+
 -----> eps-nested_minimal_includedocument.eps <-----
 
 Command: exiv2 -u -pa eps-nested_minimal_includedocument.eps

-- 
exiv2 packaging