[poppler] Branch 'poppler-0.6' - 2 commits - poppler/DCTStream.cc

[Albert Astals Cid]

 poppler/DCTStream.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0c7aa409ae57eef2a745b5cc144e5e7c46d51d0a
Merge: 28df3a5... e30d2d2...
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
Date:   Mon Oct 22 21:42:07 2007 +0200

    Merge branch 'poppler-0.6' of ssh://aacid@git.freedesktop.org/git/poppler/poppler into poppler-0.6

commit 28df3a5fd0c75f53c9f41ea4a34c2b0ff045d4dd
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
Date:   Mon Oct 22 20:38:55 2007 +0200

    exit(1) is bad in library code, use the src.abort method to describe failure

diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index 14132df..b568ca5 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -115,7 +115,8 @@ void DCTStream::reset() {
       if (c == -1)
       {
         error(-1, "Could not find start of jpeg data");
-        exit(1);
+        src.abort = true;
+        return;
       }
       if (c != 0xFF) c = 0;
     }