fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes: invalid font loading, malformed jpeg stream handling

Browse Source
This commit is contained in:
Jakub Melka
2019-09-14 19:14:01 +02:00
parent 0d048fccbd
commit 40290fd2ec
5 changed files with 308 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PdfForQtLib/sources/pdfimage.cpp
View File

@@ -42,6 +42,7 @@ struct PDFJPEGDCTSource
{
jpeg_source_mgr sourceManager;
const QByteArray* buffer = nullptr;
int startByte = 0;
};
PDFImage PDFImage::createImage(const PDFDocument* document, const PDFStream* stream, PDFColorSpacePointer colorSpace, PDFRenderErrorReporter* errorReporter)
@@ -151,6 +152,14 @@ PDFImage PDFImage::createImage(const PDFDocument* document, const PDFStream* str
source.buffer = &content;
std::memset(&source.sourceManager, 0, sizeof(jpeg_source_mgr));
// Fix issue, that image doesn't start with FFD8 (start of image marker). If this
// occurs, try to find sequence FFD8, and if we can find it, then advance the buffer.
source.startByte = qMax(content.indexOf("\xFF\xD8"), 0);
if (source.startByte > 0)
{
errorReporter->reportRenderError(RenderErrorType::Warning, PDFTranslationContext::tr("Malformed data while reading JPEG stream. %1 bytes skipped.").arg(source.startByte));
}
auto errorMethod = [](j_common_ptr ptr)
{
char buffer[JMSG_LENGTH_MAX] = { };
@@ -169,6 +178,8 @@ PDFImage PDFImage::createImage(const PDFDocument* document, const PDFStream* str
const QByteArray* buffer = source->buffer;
source->sourceManager.next_input_byte = reinterpret_cast<const JOCTET*>(buffer->constData());
source->sourceManager.bytes_in_buffer = buffer->size();
source->sourceManager.next_input_byte += source->startByte;
source->sourceManager.bytes_in_buffer -= source->startByte;
return TRUE;
}