diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-01-22 23:51:47 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-01-30 19:11:03 +0100 |
| commit | 021db6f226191e536a84ba6a76590bf5743d5d62 (patch) | |
| tree | 6aefd44be1e4572fd76386a37716ed454d4de26b /libqpdf | |
| parent | 1a8c2eb93b3116a3057e8009b8cbd7510abaf138 (diff) | |
| download | qpdf-021db6f226191e536a84ba6a76590bf5743d5d62.tar.zst | |
QPDFJob: convert password to shared pointer
Diffstat (limited to 'libqpdf')
| -rw-r--r-- | libqpdf/QPDFJob.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFJob_argv.cc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index c6eb128e..e7ea3dad 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -452,7 +452,7 @@ QPDFJob::run() std::shared_ptr<QPDF> pdf_ph; try { - pdf_ph = processFile(o.infilename, o.password); + pdf_ph = processFile(o.infilename, o.password.get()); } catch (QPDFExc& e) { diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index 715446d3..44185e9a 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -178,7 +178,7 @@ ArgParser::argShowCrypto() void ArgParser::argPassword(char* parameter) { - o.password = parameter; + o.password = QUtil::make_shared_cstr(parameter); } void @@ -197,9 +197,7 @@ ArgParser::argPasswordFile(char* parameter) } if (lines.size() >= 1) { - // Make sure the memory for this stays in scope. - o.password_alloc = QUtil::make_shared_cstr(lines.front()); - o.password = o.password_alloc.get(); + o.password = QUtil::make_shared_cstr(lines.front()); if (lines.size() > 1) { |