From 9bba313d56fd87fc0a5033f566c3d63fe3c3d53e Mon Sep 17 00:00:00 2001 From: Sergei Izmailov Date: Tue, 28 May 2019 13:48:16 +0300 Subject: Fix segfault for bad `--pdf-page` argument values pdf-page value sanitization should be done after total number of pages is available, so it's can't be done in inkscape.h On negative or greater-than-number-of-pages values 1) the error message is printed to stderr 2) first page gets import pdf-page==0 sanitized elsewhere, so no error message is printed in this case --- src/extension/internal/pdfinput/pdf-input.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/extension/internal/pdfinput/pdf-input.cpp') diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 3ff599ebf..5e0bb16e2 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -62,6 +62,19 @@ #include + +namespace { + void sanitize_page_number(int& page_num, const int num_pages){ + if (page_num < 1 || page_num > num_pages){ + std::cerr << "Inkscape::Extension::Internal::PdfInput::open: Bad page number " + << page_num + << ". Import first page instead." + << std::endl; + page_num = 1; + } + } +} + namespace Inkscape { namespace Extension { namespace Internal { @@ -815,6 +828,8 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { sp_repr_get_double(prefs, "cropTo", &crop_setting); Catalog *catalog = pdf_doc->getCatalog(); + int const num_pages = catalog->getNumPages(); + sanitize_page_number(page_num, num_pages); Page *page = catalog->getPage(page_num); if ( crop_setting >= 0.0 ) { // Do page clipping @@ -899,6 +914,8 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { if (document != NULL) { double width, height; + int const num_pages = poppler_document_get_n_pages(document); + sanitize_page_number(page_num, num_pages); PopplerPage* page = poppler_document_get_page(document, page_num - 1); poppler_page_get_size(page, &width, &height); -- cgit v1.2.3 From a290421b993dd260112ddc86fc8ba3496bcbaef8 Mon Sep 17 00:00:00 2001 From: Sergei Izmailov Date: Tue, 28 May 2019 14:14:18 +0300 Subject: Fix formatting --- src/extension/internal/pdfinput/pdf-input.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/extension/internal/pdfinput/pdf-input.cpp') diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 5e0bb16e2..0a543ca1a 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -64,15 +64,17 @@ namespace { - void sanitize_page_number(int& page_num, const int num_pages){ - if (page_num < 1 || page_num > num_pages){ - std::cerr << "Inkscape::Extension::Internal::PdfInput::open: Bad page number " - << page_num - << ". Import first page instead." - << std::endl; - page_num = 1; - } - } + +void sanitize_page_number(int &page_num, const int num_pages) { + if (page_num < 1 || page_num > num_pages) { + std::cerr << "Inkscape::Extension::Internal::PdfInput::open: Bad page number " + << page_num + << ". Import first page instead." + << std::endl; + page_num = 1; + } +} + } namespace Inkscape { -- cgit v1.2.3