diff options
| author | nicm <nicm> | 2015-11-10 22:33:47 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-11-10 22:33:47 +0000 |
| commit | 6f3475c6c713245f5ec760298af9a04b8465b844 (patch) | |
| tree | 3e5b8b52c57fd4116f503f0392993f6004c6814e | |
| parent | 005e462e01b58015f3e1d841b185186e6b5d4e14 (diff) | |
| download | rtmux-6f3475c6c713245f5ec760298af9a04b8465b844.tar.gz rtmux-6f3475c6c713245f5ec760298af9a04b8465b844.tar.bz2 rtmux-6f3475c6c713245f5ec760298af9a04b8465b844.zip | |
If realpath() fails just try the original path.
| -rw-r--r-- | cmd-load-buffer.c | 5 | ||||
| -rw-r--r-- | cmd-save-buffer.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index d81288f3..9352cbe5 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -81,8 +81,9 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq) file = xstrdup(path); else xasprintf(&file, "%s/%s", cwd, path); - if (realpath(file, resolved) == NULL) { - cmdq_error(cmdq, "%s: %s", file, strerror(errno)); + if (realpath(file, resolved) == NULL && + strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) { + cmdq_error(cmdq, "%s: %s", file, strerror(ENAMETOOLONG)); return (CMD_RETURN_ERROR); } f = fopen(resolved, "rb"); diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 8de99075..9f3deeda 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -107,8 +107,9 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq) file = xstrdup(path); else xasprintf(&file, "%s/%s", cwd, path); - if (realpath(file, resolved) == NULL) { - cmdq_error(cmdq, "%s: %s", file, strerror(errno)); + if (realpath(file, resolved) == NULL && + strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) { + cmdq_error(cmdq, "%s: %s", file, strerror(ENAMETOOLONG)); return (CMD_RETURN_ERROR); } f = fopen(resolved, flags); |