xnu-4570.71.2.tar.gz

[apple/xnu.git] / libsyscall / mach / string.c

diff --git a/libsyscall/mach/string.c b/libsyscall/mach/string.c
index 000a0f88fd02723dfa84b98a9b18dc4a55a76325..8dca9927cd90d62450a9ef78c9a55fdd635952be 100644 (file)
--- a/libsyscall/mach/string.c
+++ b/libsyscall/mach/string.c
@@ -36,7 +36,7 @@ _mach_strlen(const char *str)
        const char *p;
        for (p = str; p; p++) {
                if (*p == '\0') {
-                       return (p - str);
+                       return (int)(p - str);
                }
        }
        /* NOTREACHED */
@@ -104,8 +104,9 @@ _mach_vsnprintf(char *buffer, int length, const char *fmt, va_list ap)
                        }
                }
        }
-       *out_ptr = '\0';
-       return max - length;
+       if (max > 0)
+               *out_ptr = '\0';
+       return max - (length + 1); /* don't include the final NULL in the return value */
 }
 
 int