forked from pool/systemd
d24108b9c9
- Add several upstream bugfix patches which are missed: * 0018-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch * 0026-udevadm.xml-document-resolve-names-option-for-test.patch * 0030-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch * 0032-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch * 0031-man-document-the-b-special-boot-option.patch * 0033-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch * 0034-systemd-python-fix-booted-and-add-two-functions-to-d.patch * 0035-activate-mention-E-in-the-help-text.patch * 0036-activate-fix-crash-when-s-is-passed.patch * 0037-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch * 0038-core-socket-fix-SO_REUSEPORT.patch * 0039-journal-when-appending-to-journal-file-allocate-larg.patch * 0040-journal-optimize-bisection-logic-a-bit-by-caching-th.patch * 0041-journal-fix-iteration-when-we-go-backwards-from-the-.patch * 0042-journal-allow-journal_file_copy_entry-to-work-on-non.patch * 0043-journal-simplify-pre-allocation-logic.patch * 0044-journald-mention-how-long-we-needed-to-flush-to-var-.patch * 0046-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch * 0047-docs-remove-unneeded-the-s-in-gudev-docs.patch * 0048-man-explicitly-say-when-multiple-units-can-be-specif.patch * 0049-systemd-treat-reload-failure-as-failure.patch - Add patch 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch to avoid potential NULL pointer - Reorder patches to reflect udev/systemd usage - don't build bash-completions for bootstrap package - add more requires to this-is-only-for-build-envs to avoid problems in kiwi configs OBS-URL: https://build.opensuse.org/request/show/222383 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=176
32 lines
919 B
Diff
32 lines
919 B
Diff
From 27373e442747010dfc195296c0705f67e905a611 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
|
|
Date: Sat, 30 Nov 2013 23:45:31 +0100
|
|
Subject: [PATCH] util.c: check if return value from ttyname_r is > 0 instead
|
|
of != 0
|
|
|
|
We must return a negative error code from getttyname_malloc but
|
|
that would not be the case if ttyname_r returned a negative value.
|
|
|
|
ttyname_r should only return EBADF, ENOTTY, or ERANGE so it should
|
|
be safe to change.
|
|
---
|
|
src/shared/util.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git src/shared/util.c src/shared/util.c
|
|
index 38134ae..206fc80 100644
|
|
--- src/shared/util.c
|
|
+++ src/shared/util.c
|
|
@@ -2501,7 +2501,7 @@ int getttyname_malloc(int fd, char **r) {
|
|
assert(r);
|
|
|
|
k = ttyname_r(fd, path, sizeof(path));
|
|
- if (k != 0)
|
|
+ if (k > 0)
|
|
return -k;
|
|
|
|
char_array_0(path);
|
|
--
|
|
1.7.9.2
|
|
|