===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- src/usr.bin/tmux/cmd-show-options.c	2019/04/26 11:38:51	1.48
+++ src/usr.bin/tmux/cmd-show-options.c	2019/04/30 18:02:03	1.49
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-show-options.c,v 1.48 2019/04/26 11:38:51 nicm Exp $ */
+/* $OpenBSD: cmd-show-options.c,v 1.49 2019/04/30 18:02:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -216,19 +216,21 @@
 cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
     struct options *oo)
 {
-	struct options_entry		*o;
-	struct options_array_item	*a;
-	u_int				 idx;
-	int				 flags;
+	struct options_entry			*o;
+	struct options_array_item		*a;
+	u_int					 idx;
+	const struct options_table_entry	*oe;
 
 	o = options_first(oo);
 	while (o != NULL) {
-		flags = options_table_entry(o)->flags;
+		oe = options_table_entry(o);
 		if ((self->entry != &cmd_show_hooks_entry &&
 		    !args_has(self->args, 'H') &&
-		    (flags & OPTIONS_TABLE_IS_HOOK)) ||
+		    oe != NULL &&
+		    (oe->flags & OPTIONS_TABLE_IS_HOOK)) ||
 		    (self->entry == &cmd_show_hooks_entry &&
-		    (~flags & OPTIONS_TABLE_IS_HOOK))) {
+		    (oe == NULL ||
+		    (~oe->flags & OPTIONS_TABLE_IS_HOOK)))) {
 			o = options_next(o);
 			continue;
 		}