OpenSystemsDevelopment / qpdf

Commit 5e5e76507531819455b6932670baab00b51aea6c

Authored by m-holger
Committed by GitHub
2 parents 9352f6f8 6d9d6815

Merge pull request #1672 from m-holger/i1474 

Fix memory limit calculation in Pl_DCT
Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
CMakeLists.txt
  View file @5e5e765
... ... @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.16)
7 7 # also find the version number here. generate_auto_job also reads the
8 8 # version from here.
9 9 project(qpdf
10   - VERSION 12.3.2
  10 + VERSION 12.3.3
11 11 LANGUAGES C CXX)
12 12  
13 13 # Honor CMAKE_REQUIRED_LIBRARIES when checking for include files. This
... ...
include/qpdf/DLL.h
  View file @5e5e765
... ... @@ -27,12 +27,12 @@
27 27 /* The first version of qpdf to include the version constants is 10.6.0. */
28 28 #define QPDF_MAJOR_VERSION 12
29 29 #define QPDF_MINOR_VERSION 3
30   -#define QPDF_PATCH_VERSION 2
  30 +#define QPDF_PATCH_VERSION 3
31 31  
32 32 #ifdef QPDF_FUTURE
33   -# define QPDF_VERSION "12.3.2+future"
  33 +# define QPDF_VERSION "12.3.3+future"
34 34 #else
35   -# define QPDF_VERSION "12.3.2"
  35 +# define QPDF_VERSION "12.3.3"
36 36 #endif
37 37  
38 38 /*
... ...
job.sums
  View file @5e5e765
1 1 # Generated by generate_auto_job
2   -CMakeLists.txt 9ed8b0574b60d0625004b4f578089166d10c3d2f2bfc61edf94c105020d82264
  2 +CMakeLists.txt f79d322a133382d5b8db8e02293037954486df2b263eae699b56304a3da520a0
3 3 generate_auto_job 71df64ab48364b1f77a8fafa0ba075bb4bad2a65f2a6a6322d51a1a888f83198
4 4 include/qpdf/auto_job_c_att.hh 4c2b171ea00531db54720bf49a43f8b34481586ae7fb6cbf225099ee42bc5bb4
5 5 include/qpdf/auto_job_c_copy_att.hh 50609012bff14fd82f0649185940d617d05d530cdc522185c7f3920a561ccb42
... ... @@ -17,5 +17,5 @@ libqpdf/qpdf/auto_job_json_init.hh 33934c23235c760a1fc1375c74f4fd52c8f5accf655c5
17 17 libqpdf/qpdf/auto_job_schema.hh 81b8d57f05f5125a722912b6ee5e10fc6b02ae68e040108b75f32fc6527c02b1
18 18 manual/_ext/qpdf.py 6add6321666031d55ed4aedf7c00e5662bba856dfcd66ccb526563bffefbb580
19 19 manual/cli.rst 02792f51d72029eea5a67f12770a8f46c36e15f8a774e67c85954be16dc7e77f
20   -manual/qpdf.1 0783e8741f21ed28b3d3d2c5e07beb7eef6e227dd82bd0b316a17875f39f1589
  20 +manual/qpdf.1 90d791fc4602c265e36226a55048bf3af766156a2e91afa0a9f7394b1e3a03d1
21 21 manual/qpdf.1.in 436ecc85d45c4c9e2dbd1725fb7f0177fb627179469f114561adf3cb6cbb677b
... ...
libqpdf/Pl_DCT.cc
  View file @5e5e765
... ... @@ -392,7 +392,7 @@ Pl_DCT::decompress(void* cinfo_p)
392 392 jpeg_calc_output_dimensions(cinfo);
393 393 unsigned int width = cinfo->output_width * QIntC::to_uint(cinfo->output_components);
394 394 if (memory_limit > 0 &&
395   - width > (static_cast<unsigned long>(memory_limit) / (20U * cinfo->output_height))) {
  395 + width > (static_cast<unsigned long>(memory_limit / 20) / cinfo->output_height)) {
396 396 // Even if jpeglib does not run out of memory, qpdf will while buffering the data before
397 397 // writing it. Furthermore, for very large images runtime can be significant before the
398 398 // first warning is encountered causing a timeout in oss-fuzz.
... ...
manual/qpdf.1
  View file @5e5e765
... ... @@ -3,7 +3,7 @@
3 3 .\" Edits will be automatically overwritten if the build is
4 4 .\" run in maintainer mode.
5 5 .\"
6   -.TH QPDF "1" "" "qpdf version 12.3.2" "User Commands"
  6 +.TH QPDF "1" "" "qpdf version 12.3.3" "User Commands"
7 7 .SH NAME
8 8 qpdf \- PDF transformation software
9 9 .SH SYNOPSIS
... ...