|
 |
c2e870 |
From 77a30e94d96220d7e22dff5b3f0a7f296f01b118 Mon Sep 17 00:00:00 2001
|
|
|
c2e870 |
From: Adam Reichold <adam.reichold@t-online.de>
|
|
|
c2e870 |
Date: Tue, 6 Nov 2018 09:13:41 +0100
|
|
|
c2e870 |
Subject: [PATCH] pdfdetach: Check for valid embedded file before trying to
|
|
|
c2e870 |
save it.
|
|
|
c2e870 |
|
|
|
c2e870 |
Closes #661
|
|
|
c2e870 |
---
|
|
|
c2e870 |
utils/pdfdetach.cc | 14 ++++++++++++--
|
|
|
c2e870 |
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
c2e870 |
|
|
|
c2e870 |
diff --git a/utils/pdfdetach.cc b/utils/pdfdetach.cc
|
|
|
c2e870 |
index 846584a4..a8720c64 100644
|
|
|
c2e870 |
--- a/utils/pdfdetach.cc
|
|
|
c2e870 |
+++ b/utils/pdfdetach.cc
|
|
|
c2e870 |
@@ -251,7 +251,12 @@ int main(int argc, char *argv[]) {
|
|
|
c2e870 |
}
|
|
|
c2e870 |
*p = '\0';
|
|
|
c2e870 |
|
|
|
c2e870 |
- if (!fileSpec->getEmbeddedFile()->save(path)) {
|
|
|
c2e870 |
+ EmbFile *embFile = fileSpec->getEmbeddedFile();
|
|
|
c2e870 |
+ if (!embFile || !embFile->isOk()) {
|
|
|
c2e870 |
+ exitCode = 3;
|
|
|
c2e870 |
+ goto err2;
|
|
|
c2e870 |
+ }
|
|
|
c2e870 |
+ if (!embFile->save(path)) {
|
|
|
c2e870 |
error(errIO, -1, "Error saving embedded file as '{0:s}'", p);
|
|
|
c2e870 |
exitCode = 2;
|
|
|
c2e870 |
goto err2;
|
|
|
c2e870 |
@@ -296,7 +301,12 @@ int main(int argc, char *argv[]) {
|
|
|
c2e870 |
p = path;
|
|
|
c2e870 |
}
|
|
|
c2e870 |
|
|
|
c2e870 |
- if (!fileSpec->getEmbeddedFile()->save(p)) {
|
|
|
c2e870 |
+ EmbFile *embFile = fileSpec->getEmbeddedFile();
|
|
|
c2e870 |
+ if (!embFile || !embFile->isOk()) {
|
|
|
c2e870 |
+ exitCode = 3;
|
|
|
c2e870 |
+ goto err2;
|
|
|
c2e870 |
+ }
|
|
|
c2e870 |
+ if (!embFile->save(p)) {
|
|
|
c2e870 |
error(errIO, -1, "Error saving embedded file as '{0:s}'", p);
|
|
|
c2e870 |
exitCode = 2;
|
|
|
c2e870 |
goto err2;
|
|
|
c2e870 |
--
|
|
|
c2e870 |
2.19.1
|
|
|
c2e870 |
|