Blame SOURCES/0045-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch
|
 |
572a44 |
From 4003ebeac4b10481f32b5b1fdd65fcc905a4b9a7 Mon Sep 17 00:00:00 2001
|
|
|
572a44 |
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
|
|
|
572a44 |
Date: Sat, 30 Nov 2013 23:45:31 +0100
|
|
|
572a44 |
Subject: [PATCH] util.c: check if return value from ttyname_r is > 0 instead
|
|
|
572a44 |
of != 0
|
|
|
572a44 |
|
|
|
572a44 |
We must return a negative error code from getttyname_malloc but
|
|
|
572a44 |
that would not be the case if ttyname_r returned a negative value.
|
|
|
572a44 |
|
|
|
572a44 |
ttyname_r should only return EBADF, ENOTTY, or ERANGE so it should
|
|
|
572a44 |
be safe to change.
|
|
|
572a44 |
---
|
|
|
572a44 |
src/shared/util.c | 2 +-
|
|
|
572a44 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
572a44 |
|
|
|
572a44 |
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
|
572a44 |
index 6c88040..f602625 100644
|
|
|
572a44 |
--- a/src/shared/util.c
|
|
|
572a44 |
+++ b/src/shared/util.c
|
|
|
572a44 |
@@ -2561,7 +2561,7 @@ int getttyname_malloc(int fd, char **r) {
|
|
|
572a44 |
assert(r);
|
|
|
572a44 |
|
|
|
572a44 |
k = ttyname_r(fd, path, sizeof(path));
|
|
|
572a44 |
- if (k != 0)
|
|
|
572a44 |
+ if (k > 0)
|
|
|
572a44 |
return -k;
|
|
|
572a44 |
|
|
|
572a44 |
char_array_0(path);
|