diff options
| author | steve algernon <salgernon@eapple.com> | 2020-04-24 13:37:30 -0700 |
|---|---|---|
| committer | steve algernon <salgernon@eapple.com> | 2020-04-27 11:04:29 -0700 |
| commit | 82e3ee0e3230287b76a76fb8f16b92ca6e50b444 (patch) | |
| tree | c5c81b7be253f2e8c0c6fa88e9299a8840e3cd8d /cups | |
| parent | 1f2a315c2b3e2f78c37c1505fc66909ad01df85e (diff) | |
| download | cups-82e3ee0e3230287b76a76fb8f16b92ca6e50b444.tar.gz | |
Update version to 2.3.3 for:v2.3.3
CVE-2020-3898 - cups/ppd.c, ppdc/ppdc-source.cxx
CVE-2019-8842 - cups/ipp.c: ippReadIO
And build issues due to warnings.
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/cups.h | 4 | ||||
| -rw-r--r-- | cups/cupspm.md | 2 | ||||
| -rw-r--r-- | cups/ipp.c | 2 | ||||
| -rw-r--r-- | cups/ppd.c | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/cups/cups.h b/cups/cups.h index 6d48141e5..74955ebd6 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -42,10 +42,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0302 +# define CUPS_VERSION 2.0303 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 3 -# define CUPS_VERSION_PATCH 2 +# define CUPS_VERSION_PATCH 3 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/cups/cupspm.md b/cups/cupspm.md index d4d6d7c55..b6e09baa9 100644 --- a/cups/cupspm.md +++ b/cups/cupspm.md @@ -2,7 +2,7 @@ title: CUPS Programming Manual author: Michael R Sweet copyright: Copyright © 2007-2019 by Apple Inc. All Rights Reserved. -version: 2.3.1 +version: 2.3.3 ... > Please [file issues on Github](https://github.com/apple/cups/issues) to diff --git a/cups/ipp.c b/cups/ipp.c index 1595b8b61..3d529346c 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); diff --git a/cups/ppd.c b/cups/ppd.c index ff52df2e1..199cf0348 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1719,8 +1719,7 @@ _ppdOpen( constraint->choice1, constraint->option2, constraint->choice2)) { - case 0 : /* Error */ - case 1 : /* Error */ + default : /* Error */ pg->ppd_status = PPD_BAD_UI_CONSTRAINTS; goto error; |