===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- src/usr.bin/tmux/session.c	2015/09/01 18:50:16	1.55
+++ src/usr.bin/tmux/session.c	2015/10/27 15:58:42	1.56
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.55 2015/09/01 18:50:16 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.56 2015/10/27 15:58:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -120,10 +120,10 @@
 	TAILQ_INIT(&s->lastw);
 	RB_INIT(&s->windows);
 
-	options_init(&s->options, &global_s_options);
 	environ_init(&s->environ);
 	if (env != NULL)
 		environ_copy(env, &s->environ);
+	s->options = options_create(global_s_options);
 
 	s->tio = NULL;
 	if (tio != NULL) {
@@ -190,6 +190,9 @@
 	log_debug("session %s freed (%d references)", s->name, s->references);
 
 	if (s->references == 0) {
+		environ_free(&s->environ);
+		options_free(s->options);
+
 		free(s->name);
 		free(s);
 	}
@@ -212,8 +215,6 @@
 		event_del(&s->lock_timer);
 
 	session_group_remove(s);
-	environ_free(&s->environ);
-	options_free(&s->options);
 
 	while (!TAILQ_EMPTY(&s->lastw))
 		winlink_stack_remove(&s->lastw, TAILQ_FIRST(&s->lastw));
@@ -271,7 +272,7 @@
 
 	if (~s->flags & SESSION_UNATTACHED) {
 		timerclear(&tv);
-		tv.tv_sec = options_get_number(&s->options, "lock-after-time");
+		tv.tv_sec = options_get_number(s->options, "lock-after-time");
 		if (tv.tv_sec != 0)
 			evtimer_add(&s->lock_timer, &tv);
 	}
@@ -332,11 +333,11 @@
 	environ_copy(&s->environ, &env);
 	server_fill_environ(s, &env);
 
-	shell = options_get_string(&s->options, "default-shell");
+	shell = options_get_string(s->options, "default-shell");
 	if (*shell == '\0' || areshell(shell))
 		shell = _PATH_BSHELL;
 
-	hlimit = options_get_number(&s->options, "history-limit");
+	hlimit = options_get_number(s->options, "history-limit");
 	w = window_create(name, argc, argv, path, shell, cwd, &env, s->tio,
 	    s->sx, s->sy, hlimit, cause);
 	if (w == NULL) {
@@ -348,8 +349,8 @@
 	notify_window_linked(s, w);
 	environ_free(&env);
 
-	if (options_get_number(&s->options, "set-remain-on-exit"))
-		options_set_number(&w->options, "remain-on-exit", 1);
+	if (options_get_number(s->options, "set-remain-on-exit"))
+		options_set_number(w->options, "remain-on-exit", 1);
 
 	session_group_synchronize_from(s);
 	return (wl);
@@ -712,7 +713,7 @@
 	RB_INIT(&s->windows);
 
 	/* Start renumbering from the base-index if it's set. */
-	new_idx = options_get_number(&s->options, "base-index");
+	new_idx = options_get_number(s->options, "base-index");
 	new_curw_idx = 0;
 
 	/* Go through the winlinks and assign new indexes. */