diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-print/cups-filters/files | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'net-print/cups-filters/files')
-rw-r--r-- | net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch | 69 |
1 files changed, 0 insertions, 69 deletions
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 deleted file mode 100644 index 8ab644155c32..000000000000 --- a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -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, |