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