diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-12-08 13:51:39 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-12-08 13:51:39 +0000 |
| commit | 629d9e0ef0d98732510b4b0cfa4ed90ff7e5ab8a (patch) | |
| tree | 6244bf26705b783e1dd29607e8cf3cf1f003c488 /app/cwm | |
| parent | eee133e1decfe4df21ce7198bd364cc70ef57bec (diff) | |
If not using sticky mode (the default), clients aren't automagically
assigned a group, thus cc->group will be NULL - fix the client group
shortcut in menu lists; crash reported by Christian Neukirchen.
Diffstat (limited to 'app/cwm')
| -rw-r--r-- | app/cwm/mousefunc.c | 6 | ||||
| -rw-r--r-- | app/cwm/search.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/cwm/mousefunc.c b/app/cwm/mousefunc.c index c6343338e..7c82f42f4 100644 --- a/app/cwm/mousefunc.c +++ b/app/cwm/mousefunc.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: mousefunc.c,v 1.60 2013/12/02 19:30:27 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.61 2013/12/08 13:51:38 okan Exp $ */ #include <sys/param.h> @@ -231,8 +231,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg) continue; mi = xcalloc(1, sizeof(*mi)); - (void)snprintf(mi->text, sizeof(mi->text), - "(%d) %s", cc->group->shortcut, wname); + (void)snprintf(mi->text, sizeof(mi->text), "(%d) %s", + cc->group ? cc->group->shortcut : 0, wname); mi->ctx = cc; TAILQ_INSERT_TAIL(&menuq, mi, entry); } diff --git a/app/cwm/search.c b/app/cwm/search.c index 5c4483f59..d0bf4f911 100644 --- a/app/cwm/search.c +++ b/app/cwm/search.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: search.c,v 1.32 2013/12/02 19:30:27 okan Exp $ + * $OpenBSD: search.c,v 1.33 2013/12/08 13:51:38 okan Exp $ */ #include <sys/param.h> @@ -143,7 +143,7 @@ search_print_client(struct menu *mi, int list) cc->matchname = cc->name; (void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s", - cc->group->shortcut, flag, cc->matchname); + cc->group ? cc->group->shortcut : 0, flag, cc->matchname); if (!list && cc->matchname != cc->name && strlen(mi->print) < sizeof(mi->print) - 1) { |