42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 82e3ee0e3230287b76a76fb8f16b92ca6e50b444 Mon Sep 17 00:00:00 2001
|
|
From: steve algernon <salgernon@eapple.com>
|
|
Date: Fri, 24 Apr 2020 13:37:30 -0700
|
|
Subject: [PATCH] Update version to 2.3.3 for:
|
|
|
|
CVE-2020-3898 - cups/ppd.c, ppdc/ppdc-source.cxx
|
|
CVE-2019-8842 - cups/ipp.c: ippReadIO
|
|
|
|
And build issues due to warnings.
|
|
---
|
|
CHANGES.md | 11 ++++++++++-
|
|
INSTALL.md | 2 +-
|
|
README.md | 2 +-
|
|
config-scripts/cups-compiler.m4 | 6 ++----
|
|
configure | 24 +++++++++++-------------
|
|
configure.ac | 2 +-
|
|
cups/cups.h | 4 ++--
|
|
cups/cupspm.md | 2 +-
|
|
cups/ipp.c | 2 +-
|
|
cups/ppd.c | 3 +--
|
|
doc/help/cupspm.html | 2 +-
|
|
locale/cups.pot | 2 +-
|
|
ppdc/ppdc-source.cxx | 16 +++++++++-------
|
|
scheduler/printers.c | 2 +-
|
|
vcnet/config.h | 4 ++--
|
|
xcode/config.h | 4 ++--
|
|
16 files changed, 47 insertions(+), 41 deletions(-)
|
|
|
|
diff --git a/cups/ipp.c b/cups/ipp.c
|
|
index 1595b8b610..3d529346c2 100644
|
|
--- a/cups/ipp.c
|
|
+++ b/cups/ipp.c
|
|
@@ -2956,7 +2956,7 @@ ippReadIO(void *src, /* I - Data source */
|
|
* Read 32-bit "extension" tag...
|
|
*/
|
|
|
|
- if ((*cb)(src, buffer, 4) < 1)
|
|
+ if ((*cb)(src, buffer, 4) < 4)
|
|
{
|
|
DEBUG_puts("1ippReadIO: Callback returned EOF/error");
|
|
_cupsBufferRelease((char *)buffer);
|