61 lines
1.7 KiB
Diff
61 lines
1.7 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
|
|
|
|
And build issues due to warnings.
|
|
---
|
|
cups/ppd.c | 3 +--
|
|
ppdc/ppdc-source.cxx | 14 ++++++++------
|
|
2 files changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
https://github.com/apple/cups/commit/82e3ee0e3230287b76a76fb8f16b92ca6e50b444
|
|
|
|
diff --git a/cups/ppd.c b/cups/ppd.c
|
|
index f96dac0..8db30c5 100644
|
|
--- a/cups/ppd.c
|
|
+++ b/cups/ppd.c
|
|
@@ -1730,8 +1730,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;
|
|
|
|
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
|
|
index 5add810..383f018 100644
|
|
--- a/ppdc/ppdc-source.cxx
|
|
+++ b/ppdc/ppdc-source.cxx
|
|
@@ -1746,15 +1746,17 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
|
|
|
|
switch (sscanf(name, "%dx%d", &xdpi, &ydpi))
|
|
{
|
|
- case 0 :
|
|
- _cupsLangPrintf(stderr,
|
|
- _("ppdc: Bad resolution name \"%s\" on line %d of "
|
|
- "%s."), name, fp->line, fp->filename);
|
|
- break;
|
|
case 1 :
|
|
ydpi = xdpi;
|
|
break;
|
|
- }
|
|
+ case 2 :
|
|
+ break;
|
|
+ default :
|
|
+ _cupsLangPrintf(stderr,
|
|
+ _("ppdc: Bad resolution name \"%s\" on line %d of "
|
|
+ "%s."), name, fp->line, fp->filename);
|
|
+ break;
|
|
+}
|
|
|
|
// Create the necessary PS commands...
|
|
snprintf(command, sizeof(command),
|
|
--
|
|
2.23.0
|
|
|