Merge branch 'obsd-master'

4 files changed, 11 insertions, 11 deletions

diff --git a/control.c b/control.c
index c52f2020..e86429cf 100644
--- a/control.c
+++ b/control.c
@@ -688,8 +688,8 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
 		else
 			age = 0;
 		log_debug("%s: %s: output block %zu (age %llu) for %%%u "
-		    "(used %zu/%zu)", __func__, c->name, cb->size, age,
-		    cp->pane, used, limit);
+		    "(used %zu/%zu)", __func__, c->name, cb->size,
+		    (unsigned long long)age, cp->pane, used, limit);
 
 		size = cb->size;
 		if (size > limit - used)
diff --git a/input-keys.c b/input-keys.c
index ff402503..32ca4b97 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -555,6 +555,8 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 	case KEYC_SHIFT|KEYC_META|KEYC_CTRL:
 		modifier = '8';
 		break;
+	default:
+		fatalx("invalid key modifiers: %llx", key);
 	}
 	xsnprintf(tmp, sizeof tmp, "\033[%llu;%cu", outkey, modifier);
 	bufferevent_write(bev, tmp, strlen(tmp));
diff --git a/window-copy.c b/window-copy.c
index 640a69ec..e46c910c 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -2853,6 +2853,7 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
 			free(sbuf);
 			return (0);
 		}
+		free(sbuf);
 	}
 
 	if (direction) {
@@ -2889,10 +2890,8 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
 			fx = gd->sx - 1;
 		}
 	}
-	if (regex) {
-		free(sbuf);
+	if (regex)
 		regfree(&reg);
-	}
 
 	if (found) {
 		window_copy_scroll_to(wme, px, i, 1);
@@ -3042,6 +3041,7 @@ window_copy_search_marks(struct window_mode_entry *wme, struct screen *ssp,
 			free(sbuf);
 			return (0);
 		}
+		free(sbuf);
 	}
 	tstart = get_timer();
 
@@ -3139,10 +3139,8 @@ again:
 out:
 	if (ssp == &ss)
 		screen_free(&ss);
-	if (regex) {
-		free(sbuf);
+	if (regex)
 		regfree(&reg);
-	}
 	return (1);
 }
 
diff --git a/window-customize.c b/window-customize.c
index c8606245..1dad07cd 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -380,7 +380,7 @@ window_customize_build_options(struct window_customize_modedata *data,
     struct format_tree *ft, const char *filter, struct cmd_find_state *fs)
 {
 	struct mode_tree_item		 *top;
-	struct options_entry		 *o, *loop;
+	struct options_entry		 *o = NULL, *loop;
 	const char			**list = NULL, *name;
 	u_int				  size = 0, i;
 	enum window_customize_scope	  scope;
@@ -1018,7 +1018,7 @@ window_customize_set_option(struct client *c,
 	struct options				*oo;
 	struct window_customize_itemdata	*new_item;
 	int					 flag, idx = item->idx;
-	enum window_customize_scope		 scope;
+	enum window_customize_scope		 scope = WINDOW_CUSTOMIZE_NONE;
 	u_int					 choice;
 	const char				*name = item->name, *space = "";
 	char					*prompt, *value, *text;
@@ -1031,7 +1031,7 @@ window_customize_set_option(struct client *c,
 		return;
 
 	oe = options_table_entry(o);
-	if (~oe->scope & OPTIONS_TABLE_PANE)
+	if (oe != NULL && ~oe->scope & OPTIONS_TABLE_PANE)
 		pane = 0;
 	if (oe != NULL && (oe->flags & OPTIONS_TABLE_IS_ARRAY)) {
 		scope = item->scope;