diff options
| author | okan | 2013-12-08 13:51:38 +0000 |
|---|---|---|
| committer | okan | 2013-12-08 13:51:38 +0000 |
| commit | 47cab12c79888734f79ac0f19e11b2ea7ba712ad (patch) | |
| tree | 532cf284c737ce967b55e9054c5cd1c006195227 | |
| parent | 1b52a28e341778e2233373eba9be8625358a19c0 (diff) | |
| download | cwm-47cab12c79888734f79ac0f19e11b2ea7ba712ad.tar.gz | |
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.
| -rw-r--r-- | mousefunc.c | 6 | ||||
| -rw-r--r-- | search.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mousefunc.c b/mousefunc.c index c634333..7c82f42 100644 --- a/mousefunc.c +++ b/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); } @@ -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) { |