Revision: 2823
http://tmux.svn.sourceforge.net/tmux/?rev=2823&view=rev
Author: tcunha
Date: 2012-06-18 15:14:48 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Sync OpenBSD patchset 1135:
Do not crash when the current session has no window, fixes a bug
reported by Giorgio Lando. Fix from Thomas Adam.
Modified Paths:
--------------
trunk/cmd.c
Modified: trunk/cmd.c
===================================================================
--- trunk/cmd.c 2012-06-18 15:12:54 UTC (rev 2822)
+++ trunk/cmd.c 2012-06-18 15:14:48 UTC (rev 2823)
@@ -1289,7 +1289,7 @@
/* Session working directory. */
root = s->cwd;
goto complete_path;
- } else if (cwd[0] == '.' && (cwd[1] == '\0' || cwd[1] == '/')){
+ } else if (cwd[0] == '.' && (cwd[1] == '\0' || cwd[1] == '/')) {
/* Server working directory. */
if (getcwd(tmp, sizeof tmp) != NULL) {
root = tmp;
@@ -1303,7 +1303,7 @@
/* Empty or relative path. */
if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
root = ctx->cmdclient->cwd;
- else if (ctx->curclient != NULL)
+ else if (ctx->curclient != NULL && s->curw != NULL)
root = osdep_get_cwd(s->curw->window->active->pid);
else
return (s->cwd);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
