From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5B5A13997D for ; Thu, 14 Nov 2019 08:15:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DE30E0828; Thu, 14 Nov 2019 08:15:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D64A4E0828 for ; Thu, 14 Nov 2019 08:15:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 591DF34CA6F for ; Thu, 14 Nov 2019 08:15:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F38F0824 for ; Thu, 14 Nov 2019 08:15:23 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1573719317.e64d6fba8ed13603a8280f7c633211d4542cb5d0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups-filters/cups-filters-1.25.12-r1.ebuild net-print/cups-filters/cups-filters-1.25.12.ebuild net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch X-VCS-Directories: net-print/cups-filters/files/ net-print/cups-filters/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e64d6fba8ed13603a8280f7c633211d4542cb5d0 X-VCS-Branch: master Date: Thu, 14 Nov 2019 08:15:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24b4b263-3618-415e-b37f-07b7985560ca X-Archives-Hash: 7111a570038d72cbd6228a48076bc0b4 commit: e64d6fba8ed13603a8280f7c633211d4542cb5d0 Author: Lars Wendler gentoo org> AuthorDate: Thu Nov 14 08:14:49 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Nov 14 08:15:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64d6fba net-print/cups-filters: Revbump to fix segfault in cups-browsed Reported-by: Joakim Tjernlund infinera.com> Thanks-to: Joakim Tjernlund infinera.com> Closes: https://bugs.gentoo.org/700024 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler gentoo.org> ...25.12.ebuild => cups-filters-1.25.12-r1.ebuild} | 4 ++ .../cups-filters-1.25.12-browsed_segfault.patch | 69 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/net-print/cups-filters/cups-filters-1.25.12.ebuild b/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild similarity index 98% rename from net-print/cups-filters/cups-filters-1.25.12.ebuild rename to net-print/cups-filters/cups-filters-1.25.12-r1.ebuild index cc938610ec4..1179f01061e 100644 --- a/net-print/cups-filters/cups-filters-1.25.12.ebuild +++ b/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild @@ -53,6 +53,10 @@ BDEPEND=" test? ( media-fonts/dejavu ) " +PATCHES=( + "${FILESDIR}/${P}-browsed_segfault.patch" #700024 +) + src_prepare() { default [[ "${PV}" == "9999" ]] && eautoreconf diff --git a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch new file mode 100644 index 00000000000..8ab644155c3 --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch @@ -0,0 +1,69 @@ +From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Wed, 13 Nov 2019 18:49:01 +0100 +Subject: [PATCH] cups-browsed: Added missing memory allocations leading to a + segfault. + +--- + NEWS | 5 +++++ + utils/cups-browsed.c | 21 ++++++++++++--------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/NEWS b/NEWS +index 67d1c18f..2de5dab4 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,11 @@ + NEWS - OpenPrinting CUPS Filters v1.25.12 - 2019-11-12 + ------------------------------------------------------ + ++CHANGES IN V1.25.13 ++ ++ - cups-browsed: Added some missing memory allocations leading ++ to a segfault (Issue #175). ++ + CHANGES IN V1.25.12 + + - libcupsfilters: Use the text names "Draft", "Normal", and +diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c +index adbf5002..f0e05746 100644 +--- a/utils/cups-browsed.c ++++ b/utils/cups-browsed.c +@@ -2837,6 +2837,15 @@ void get_cluster_default_attributes(ipp_t** merged_attributes, + debug_printf("Default MediaType: %s\n", media_type); + } + ++ if (temp->media_type == NULL) { ++ if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD, ++ "media-type-supported")) { ++ temp->media_type = (char*)malloc(sizeof(char)*32); ++ strcpy(temp->media_type, AUTO_OPTION); ++ debug_printf("Default MediaType: " AUTO_OPTION "\n"); ++ } ++ } ++ + if ((media_attr = ippFindAttribute(media_col, "media-source", + IPP_TAG_KEYWORD)) != NULL) { + pwg_ppdize_name(ippGetString(media_attr, 0, NULL), media_source, +@@ -2852,18 +2861,12 @@ void get_cluster_default_attributes(ipp_t** merged_attributes, + if (temp->media_source == NULL) { + if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD, + "media-source-supported")) { +- strcpy(temp->media_source,AUTO_OPTION); +- debug_printf("Default MediaSource: %s\n", media_source); ++ temp->media_source = (char*)malloc(sizeof(char)*32); ++ strcpy(temp->media_source, AUTO_OPTION); ++ debug_printf("Default MediaSource: " AUTO_OPTION "\n"); + } + } + +- if (temp->media_type == NULL) { +- if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD, +- "media-type-supported")) { +- strcpy(temp->media_type, AUTO_OPTION); +- debug_printf("Default MediaType: %s\n", media_type); +- } +- } + media_col_default = ippAddCollection(*merged_attributes, IPP_TAG_PRINTER, + "media-col-default", NULL); + current_media = create_media_col(temp->x, temp->y, temp->left_margin,