summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/strv.c2
-rw-r--r--src/basic/util.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/basic/strv.c b/src/basic/strv.c
index 90f0b8c741..d5169467da 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -784,5 +784,5 @@ rollback:
free(nl[j]);
nl[k] = NULL;
- return NULL;
+ return -ENOMEM;
}
diff --git a/src/basic/util.c b/src/basic/util.c
index 630c7ea9ff..2855993afe 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -6849,12 +6849,14 @@ int version(void) {
bool fdname_is_valid(const char *s) {
const char *p;
- /* Validates a name for $LISTEN_NAMES. We basically allow
+ /* Validates a name for $LISTEN_FDNAMES. We basically allow
* everything ASCII that's not a control character. Also, as
* special exception the ":" character is not allowed, as we
- * use that as field separator in $LISTEN_NAMES.
+ * use that as field separator in $LISTEN_FDNAMES.
*
- * Note that the empty string is explicitly allowed here.*/
+ * Note that the empty string is explicitly allowed
+ * here. However, we limit the length of the names to 255
+ * characters. */
if (!s)
return false;