Bug 262908 - x11-wm/xfce4-wm fix crashing, when broken client insists on nonexistent icon
Summary: x11-wm/xfce4-wm fix crashing, when broken client insists on nonexistent icon
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-xfce (Nobody)
URL: https://gitlab.xfce.org/xfce/xfwm4/-/...
Keywords: easy, patch-ready
Depends on:
Blocks:
 
Reported: 2022-03-29 17:10 UTC by Mikhail Teterin
Modified: 2022-03-30 08:42 UTC (History)
1 user (show)

See Also:
madpilot: maintainer-feedback+
madpilot: merge-quarterly+

Attachments
Ignore nonexisting icons, instead of crashing (1.89 KB, patch)
2022-03-29 17:10 UTC, Mikhail Teterin 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mikhail Teterin freebsd_committer freebsd_triage 2022-03-29 17:10:57 UTC 
Created attachment 232801 [details]
Ignore nonexisting icons, instead of crashing

The attached patch is an adaptation of the upstream's commit closing ticket 570 (and 637). Until a new release (4.16.2?) is made available, the port should have this patch added...
Comment 1 Guido Falsi freebsd_committer freebsd_triage 2022-03-29 22:55:24 UTC 
Thanks for reporting!

I'm going to test this.

For reference, this is the upstream commit with the relevant patch:

https://gitlab.xfce.org/xfce/xfwm4/-/commit/a7971823de40a17dcba940fcef56d781626826d3
Comment 2 commit-hook freebsd_committer freebsd_triage 2022-03-30 08:38:11 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=45e9c8923b1f38f856b2df9b7385cabbff95d82c

commit 45e9c8923b1f38f856b2df9b7385cabbff95d82c
Author:     Mikhail Teterin <mi@FreeBSD.org>
AuthorDate: 2022-03-30 08:33:57 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-03-30 08:36:38 +0000

    x11-wm/xfce4-wm: Import upsstream patch fixing crashs

    xfce4-wm could crash if a broken client tries to usse a nonexistent
    icon. Importing upstream patch that avoids the crash.

    PR:             262908
    Obtained from:  https://gitlab.xfce.org/xfce/xfwm4/-/commit/a7971823de40a17dcba940fcef56d781626826d3
    MFH:            2022Q1

 x11-wm/xfce4-wm/Makefile                      |  1 +
 x11-wm/xfce4-wm/files/patch-src_icons.c (new) | 46 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-03-30 08:40:13 UTC 
A commit in branch 2022Q1 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8eb564bc5a6be8cb06ea69f883397176d595933f

commit 8eb564bc5a6be8cb06ea69f883397176d595933f
Author:     Mikhail Teterin <mi@FreeBSD.org>
AuthorDate: 2022-03-30 08:33:57 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-03-30 08:39:04 +0000

    x11-wm/xfce4-wm: Import upsstream patch fixing crashs

    xfce4-wm could crash if a broken client tries to usse a nonexistent
    icon. Importing upstream patch that avoids the crash.

    PR:             262908
    Obtained from:  https://gitlab.xfce.org/xfce/xfwm4/-/commit/a7971823de40a17dcba940fcef56d781626826d3
    MFH:            2022Q1

    (cherry picked from commit 45e9c8923b1f38f856b2df9b7385cabbff95d82c)

 x11-wm/xfce4-wm/Makefile                      |  1 +
 x11-wm/xfce4-wm/files/patch-src_icons.c (new) | 46 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2022-03-30 08:42:53 UTC 
Patch committed, and merged to quarterly.

Thanks!