From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 18 Oct 2011 16:32:28 +0000 (+0000)
Subject: Ensure termination in Windows vsnprintf wrapper
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ddea50b5a7e04a28e2a15b2989125ccc4532ccf6;p=krb5.git

Ensure termination in Windows vsnprintf wrapper

The Windows _vsnprintf does not terminate its output buffer in the
overflow case.  Make sure we do that in the wrapper.  Reported by
Chris Hecker.

(Not an issue for KfW 3.2 since we weren't using snprintf in 1.6.x
except in Unix-specific code.)

ticket: 6980
target_version: 1.10
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25367 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index 77d710b49..d1896e7f8 100644
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -958,8 +958,10 @@ vsnprintf(char *str, size_t size, const char *format, va_list args)
     va_copy(args_copy, args);
     length = _vscprintf(format, args_copy);
     va_end(args_copy);
-    if (size)
+    if (size > 0) {
         _vsnprintf(str, size, format, args);
+        str[size - 1] = '\0';
+    }
     return length;
 }
 static inline int