Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2018-06-15 14:31:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Fri Jun 15 14:31:38 2018 rev:116 rq:614561 version:3.17.9 Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2018-03-24 16:08:54.849482712 +0100 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2018-06-15 14:31:46.768155955 +0200 @@ -1,0 +2,6 @@ +Fri Jun 1 15:18:19 UTC 2018 - [email protected] + +- avoid segfault in DJGenericVIP::DJGenericVIP() (boo#1094141) + * added hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch + +------------------------------------------------------------------- New: ---- hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.CabRxS/_old 2018-06-15 14:31:48.108106944 +0200 +++ /var/tmp/diff_new_pack.CabRxS/_new 2018-06-15 14:31:48.112106798 +0200 @@ -57,7 +57,7 @@ Version: 3.17.9 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software -License: BSD-3-Clause and GPL-2.0+ and MIT +License: BSD-3-Clause AND GPL-2.0-or-later AND MIT Group: Hardware/Printing Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: @@ -89,6 +89,7 @@ Patch108: add_missing_includes_and_define_GNU_SOURCE.patch # PATCH-FIX-SUSE: GNOME no longer provides a system tray, so don't warn the user that we can't find it Patch109: no-systray-failure-message.patch +Patch110: hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch # Patch200 fixes device communication and detection via MDNS in some network setups: Patch200: hplip-mdns.patch # Patch201 makes MDNS lookups more robust by retrying queries: @@ -396,6 +397,7 @@ # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig %patch109 -p1 -b .systemtray.py.orig +%patch110 -p1 -b .boo1094141 %patch200 -p1 -b .mdns %patch201 -p1 -b .mdns-retry %patch300 -p1 -b .pcardext-python3 ++++++ hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch ++++++ >From 894ea64f4742a5c2a5f17f4e950f4ae3599d802e Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Fri, 1 Jun 2018 17:09:31 +0200 Subject: [PATCH] hpijs: avoid segfault in DJGenericVIP::DJGenericVIP() DJGenericVIP::DJGenericVIP() doesn't treat an error from VerifyPenInfo() as fatal, but the superclass constructor DJ9xxVIP::DJ9xxVIP() does. This may lead to a sefgault in DJGenericVIP::DJGenericVIP() because ModeCount and pMode aren't initialized by the superclass constructor. Signed-off-by: Martin Wilck <[email protected]> --- prnt/hpijs/dj9xxvip.cpp | 8 ++++++-- prnt/hpijs/dj9xxvip.h | 3 ++- prnt/hpijs/djgenericvip.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/prnt/hpijs/dj9xxvip.cpp b/prnt/hpijs/dj9xxvip.cpp index 519036c..0a5c959 100644 --- a/prnt/hpijs/dj9xxvip.cpp +++ b/prnt/hpijs/dj9xxvip.cpp @@ -55,7 +55,8 @@ extern MediaType MediaTypeToPcl (MEDIATYPE eMediaType); DJ9xxVIP::DJ9xxVIP ( SystemServices* pSS, - BOOL proto + BOOL proto, + BOOL ignore_pen_error ) : Printer(pSS, NUM_DJ6XX_FONTS, proto), PCL3acceptsDriverware(TRUE) @@ -67,7 +68,10 @@ DJ9xxVIP::DJ9xxVIP { bCheckForCancelButton = TRUE; constructor_error = VerifyPenInfo(); - CERRCHECK; + if (!ignore_pen_error) { + CERRCHECK; + } else + ePen = BOTH_PENS; } else ePen = BOTH_PENS; // matches default mode diff --git a/prnt/hpijs/dj9xxvip.h b/prnt/hpijs/dj9xxvip.h index 85eb3ac..8d42265 100644 --- a/prnt/hpijs/dj9xxvip.h +++ b/prnt/hpijs/dj9xxvip.h @@ -42,7 +42,8 @@ APDK_BEGIN_NAMESPACE class DJ9xxVIP : public Printer { public: - DJ9xxVIP(SystemServices* pSS, BOOL proto=FALSE); + DJ9xxVIP(SystemServices* pSS, BOOL proto=FALSE, + BOOL ignore_pen_error=TRUE); Header* SelectHeader(PrintContext* pc); DRIVER_ERROR VerifyPenInfo(); diff --git a/prnt/hpijs/djgenericvip.cpp b/prnt/hpijs/djgenericvip.cpp index b7e79dc..7228fcf 100644 --- a/prnt/hpijs/djgenericvip.cpp +++ b/prnt/hpijs/djgenericvip.cpp @@ -47,7 +47,7 @@ extern uint32_t ulMapDJ600_CCM_K[ 9 * 9 * 9 ]; */ DJGenericVIP::DJGenericVIP (SystemServices* pSS, BOOL proto) - : DJ9xxVIP (pSS, proto) + : DJ9xxVIP (pSS, proto, true) { if (!proto && IOMode.bDevID) -- 2.17.0
