X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futil.c;h=97f766c33c5b043559472d3b6817d442626c4bc1;hp=02ee6374c33aa2f50bf9c777c557d823f6bec3b1;hb=e98055de981b568c31f18f470181ae166b56f172;hpb=040f18ea8a682dc80c9f3940cf234ccd1135e115

diff --git a/src/shared/util.c b/src/shared/util.c
index 02ee6374c..97f766c33 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1184,7 +1184,7 @@ char *strnappend(const char *s, const char *suffix, size_t b) {
         assert(suffix);
 
         a = strlen(s);
-        if ((size_t) -1 - a > b)
+        if (b > ((size_t) -1) - a)
                 return NULL;
 
         r = new(char, a+b+1);
@@ -5024,8 +5024,10 @@ char *strjoin(const char *x, ...) {
                                 break;
 
                         n = strlen(t);
-                        if (n > ((size_t) -1) - l)
+                        if (n > ((size_t) -1) - l) {
+                                va_end(ap);
                                 return NULL;
+                        }
 
                         l += n;
                 }