aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-29 17:46:01 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-29 17:46:20 +0000
commit113759b0a9cf4954f64dd59a65654fcb85d43792 (patch)
treeecab8163dfb84377943789803fa6da25e3d594ae /slave.c
parentconfig: emit a user-warning for deprecated option 'scrollback' (diff)
slave: don't ignore write(3) errors
Diffstat (limited to 'slave.c')
-rw-r--r--slave.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/slave.c b/slave.c
index 6b14dd61..6652d02a 100644
--- a/slave.c
+++ b/slave.c
@@ -127,14 +127,20 @@ slave_exec(int ptmx, char *argv[], int err_fd, bool login_shell,
for (size_t i = 0; i < warning_count; i++) {
switch (warnings[i].kind) {
case USER_WARNING_DEPRECATION:
- write(pts, "\e[33;1;5mdeprecated:\e[39;21;25m ", 32);
+ if (write(pts, "\e[33;1;5mdeprecated:\e[39;21;25m ", 32) < 0)
+ goto err;
}
- write(pts, warnings[i].text, strlen(warnings[i].text));
- write(pts, "\e[m\n", 4);
+ if (write(pts, warnings[i].text, strlen(warnings[i].text)) < 0 ||
+ write(pts, "\e[m\n", 4) < 0)
+ {
+ goto err;
+ }
free(warnings[i].text);
+ warnings[i].text = NULL;
}
free(warnings);
+ warnings = NULL;
close(pts);
pts = -1;
@@ -161,6 +167,11 @@ err:
if (ptmx != -1)
close(ptmx);
close(err_fd);
+
+ for (size_t i = 0; i < warning_count; i++)
+ free(warnings[i].text);
+ free(warnings);
+
_exit(errno);
}