diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2012-10-30 10:29:40 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2012-10-30 10:30:04 +0100 |
commit | f3910003bce32ebdc1dbb71fd9ca2d4b8352b563 (patch) | |
tree | 86d7662a2c26332b67add144ad20e63abdbd1aa1 /src/libsystemd-daemon | |
parent | 0eb59ccfe619cbc4b42ef8ff02b52971994dfe05 (diff) |
shared, libsystemd-daemon: check for empty strings in strto*l conversions
strtol() and friends may set EINVAL if no conversion was performed, but
they are not required to do so. In practice they don't. We need to check
for it.
https://bugzilla.redhat.com/show_bug.cgi?id=870577
Diffstat (limited to 'src/libsystemd-daemon')
-rw-r--r-- | src/libsystemd-daemon/sd-daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-daemon/sd-daemon.c b/src/libsystemd-daemon/sd-daemon.c index 863ac75290..480db3bbb9 100644 --- a/src/libsystemd-daemon/sd-daemon.c +++ b/src/libsystemd-daemon/sd-daemon.c @@ -88,7 +88,7 @@ _sd_export_ int sd_listen_fds(int unset_environment) { goto finish; } - if (!p || *p || l <= 0) { + if (!p || p == e || *p || l <= 0) { r = -EINVAL; goto finish; } @@ -112,7 +112,7 @@ _sd_export_ int sd_listen_fds(int unset_environment) { goto finish; } - if (!p || *p) { + if (!p || p == e || *p) { r = -EINVAL; goto finish; } |