From def6d66341660963ec8f1f54ac0be0c18936facc Mon Sep 17 00:00:00 2001 From: Cagebreak Signing Key 3 Date: Wed, 18 Nov 2020 21:58:49 +0100 Subject: [PATCH] Release 1.4.4 - Increment dependency versions - Fix Issue 21 --- Bugs.md | 7 +++++++ README.md | 5 +++++ fuzz/fuzz-lib.c | 8 ++++++++ fuzz/fuzz-lib.h | 8 ++++---- man/cagebreak-config.5.md | 2 +- man/cagebreak.1.md | 2 +- meson.build | 10 +++++----- signatures/1.4.3.sig | Bin 0 -> 566 bytes signatures/cagebreak.sig | Bin 566 -> 566 bytes xdg_shell.c | 2 +- 10 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 signatures/1.4.3.sig diff --git a/Bugs.md b/Bugs.md index 6080e81..f81d2fc 100644 --- a/Bugs.md +++ b/Bugs.md @@ -258,3 +258,10 @@ adequately. Cagebreak up to and including release 1.4.2 does not handle damaging adequately, when scanning out views. +### Issue 21 + + * github issue number: N/A + * Fixed: 1.4.4 + +Cagebreak up to and including release 1.4.3 sometimes had null pointer +dereferences on view destroy. diff --git a/README.md b/README.md index 7a5b484..e5e0d99 100644 --- a/README.md +++ b/README.md @@ -180,6 +180,11 @@ ninja -C build For every release after 1.0.5, hashes will be provided. +1.4.4 + + * sha 256: c6e08e19feb17f768e136cf02f5692ef121ff289763dc60ef8678103803d3307 + * sha 512: aebf27fa9c24f93dfd0b7c96536c253e2ea603d6746c40e8de2163e06367bc57ac4e22d6c07dd1e0963cce5b18b460d373e15b5c12a5a42ae6b70787971960c9 + 1.4.3 * sha 256: 5e29cbaf7c0c5ca74f71a5605bb3d6e302e051798401fee9a79419720b8d8e95 diff --git a/fuzz/fuzz-lib.c b/fuzz/fuzz-lib.c index e99a21f..a32e062 100644 --- a/fuzz/fuzz-lib.c +++ b/fuzz/fuzz-lib.c @@ -59,6 +59,14 @@ #include "fuzz-lib.h" +struct cg_server server; +struct wlr_xdg_shell *xdg_shell; + +struct wlr_xwayland *xwayland; +#if CG_HAS_XWAYLAND +struct wlr_xcursor_manager *xcursor_manager; +#endif + static bool drop_permissions(void) { if(getuid() != geteuid() || getgid() != getegid()) { diff --git a/fuzz/fuzz-lib.h b/fuzz/fuzz-lib.h index 0ea499b..7182a50 100644 --- a/fuzz/fuzz-lib.h +++ b/fuzz/fuzz-lib.h @@ -17,12 +17,12 @@ #define WAIT_ANY -1 #endif -struct cg_server server; -struct wlr_xdg_shell *xdg_shell; +extern struct cg_server server; +extern struct wlr_xdg_shell *xdg_shell; -struct wlr_xwayland *xwayland; +extern struct wlr_xwayland *xwayland; #if CG_HAS_XWAYLAND -struct wlr_xcursor_manager *xcursor_manager; +extern struct wlr_xcursor_manager *xcursor_manager; #endif void diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index b6fbdbc..197c91a 100644 --- a/man/cagebreak-config.5.md +++ b/man/cagebreak-config.5.md @@ -1,4 +1,4 @@ -% CAGEBREAK-CONFIG(1) Version 1.4.3 | Cagebreak Manual +% CAGEBREAK-CONFIG(1) Version 1.4.4 | Cagebreak Manual # NAME diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index f00fe65..3640ee3 100644 --- a/man/cagebreak.1.md +++ b/man/cagebreak.1.md @@ -1,4 +1,4 @@ -% CAGEBREAK(1) Version 1.4.3 | Cagebreak Manual +% CAGEBREAK(1) Version 1.4.4 | Cagebreak Manual # NAME diff --git a/meson.build b/meson.build index ea77b3a..64bbe40 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cagebreak', 'c', - version: '1.4.3', + version: '1.4.4', license: 'MIT', default_options: [ 'c_std=c11', @@ -53,7 +53,7 @@ if is_freebsd ) endif -wlroots = dependency('wlroots', version: '>= 0.11.0') +wlroots = dependency('wlroots', version: '>= 0.12.0') wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') wayland_cursor = dependency('wayland-cursor') @@ -195,13 +195,13 @@ reproducible_build_versions = { 'wayland_server': '1.18.0', 'wayland_client': '1.18.0', 'wayland_cursor': '1.18.0', - 'wlroots': '0.11.0', + 'wlroots': '0.12.0', 'xkbcommon': '1.0.1', 'fontconfig': '2.13.91', 'pixman': '0.40.0', - 'pango': '1.46.2', + 'pango': '1.48.0', 'cairo': '1.17.3', - 'pangocairo': '1.46.2', + 'pangocairo': '1.48.0', 'math': '-1' } diff --git a/signatures/1.4.3.sig b/signatures/1.4.3.sig new file mode 100644 index 0000000000000000000000000000000000000000..e37900ae5112e1a847f09b2ebb0e6510976205e1 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+6HLHmt3S1SZD7Rm95KPD1rPrth0$+ig1po>O5Ofes z$K0jYsEa5M|4S<4>Nsp7chrSk^nD2_U@uRkQNx1>=vLoe<9Zg}=*ENj-4!7Bz!paG ze6(KE^paDYcA$QlsSD1re4S`Qjyk&4bY{dg%XPEH&jD?y2|}H|vD69c8R66N)s1$! z38gKvI29ExS(yx#jeyPrk+9lEKEis|+ z;~Ak%+GrNSF-Nb@gvIlG=IdlrqHO_s-UIW=fQpz#fnF~8jP(o>e*kUto^+;-%}rUI zh4356xsL0X;%?#JFap79CKm@iEpX}<_f;XxofG4#r(VJleemcomu}x)rtyel1z6hq z<-wfnpvMP;uH9aCx(6qYyEew}sr_*i1g$>2uBrCN6@!^L5bi$dlI$au9%rJ?TtAUV8a@U{NR`B-6ffCpziX zM?4W{1|qIO91wp@XaPLt%Uu6`Emxg%LEmJ-O&lHt=d2Y4DOL}^m!64iG%=Q3w$B!_ zKh^z~!FX^-h&#Gpy^!0qG%PMOypD7ZYEK)-3f35B2F(j3~6B146GQNkI)Ue$Y#5Ln+M zH7cbx${R_KMw}MmY3WBfxmFOkO&Ci@pz`PoS^IQIOJZO~>VM6t9l!IQ`F}VtX3T<< zA?f95K5I#7JLt3wAf6n9;kanz%hklJ2%Lv_8r1z_>GGr~ZyyB(@K4mX6;;IROrWG> z;Y#(U3@Dv*sJ`FC*XlKmmNJ#_@25x!D*YA%Lj*pT-EQ!-7Bj!k@|eR|gE#TVxe5HORpNvdQCC zm=$+&;=sV6XMzT(=J9Oj1B;WA>v+|^PjY;!2@Q|b_5s(t{q3$zZa!SbQQ10ydMV+1k-d$|DHtLcv3_vx( g1kXc?9v5RtKcqena5_LQazbyddVE{Khf77F&4n2bkpKVy delta 542 zcmV+(0^$9(1hxc_BY%OM1po>O5Ofes$K0jYsEa5M|4S<4>Nsp7chrSk^nD2_U@uRk zQNx1>=vLoe<9Zg}=*ENj-4!7Bz!paGe6(KE^paDYcA$QlsSD1re4S`Qjyk&4bY{dg z%XPEH&jD?y2|}H|vD69c8R66N)s1$!38gKvI29ExS(yx#hZ$t)<=<6xiB znD>7lzR`n!845o__I|0(jM^p9>@6{&@Z%YwP1x*7n>2a{YkmmZ)Bot2Un zy44@WV#BG00fuzq?WDKtU{q-cbG$loaZ7pfJulu@J26ME&xFPEeCF$9Q=)AFdfo%` z$$*NOMuA=~`G1V{3=)3;ZSzCqg;omRK6A^ zApJ7SDkc0 z-(j&u%c gPaDSy))yFO2F(jview; + wl_list_remove(&xdg_shell_view->new_popup.link); wl_list_remove(&xdg_shell_view->commit.link); view_unmap(view); @@ -316,7 +317,6 @@ handle_xdg_shell_surface_destroy(struct wl_listener *listener, void *_data) { wl_list_remove(&xdg_shell_view->unmap.link); wl_list_remove(&xdg_shell_view->destroy.link); wl_list_remove(&xdg_shell_view->request_fullscreen.link); - wl_list_remove(&xdg_shell_view->new_popup.link); xdg_shell_view->xdg_surface = NULL; view_destroy(view);