Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / boringssl / src / crypto / bio / printf.c

diff --git a/src/third_party/boringssl/src/crypto/bio/printf.c b/src/third_party/boringssl/src/crypto/bio/printf.c
index daebe74..3638915 100644 (file)
--- a/src/third_party/boringssl/src/crypto/bio/printf.c
+++ b/src/third_party/boringssl/src/crypto/bio/printf.c
@@ -54,8 +54,8 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
-#if !defined(_BSD_SOURCE)
-#define _BSD_SOURCE  /* for snprintf, vprintf etc */
+#if !defined(_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE 201410L  /* for snprintf, vprintf etc */
 #endif
 
 #include <openssl/bio.h>
@@ -75,6 +75,17 @@ int BIO_printf(BIO *bio, const char *format, ...) {
   out_len = vsnprintf(buf, sizeof(buf), format, args);
   va_end(args);
 
+#if defined(OPENSSL_WINDOWS)
+  /* On Windows, vsnprintf returns -1 rather than the requested length on
+   * truncation */
+  if (out_len < 0) {
+    va_start(args, format);
+    out_len = _vscprintf(format, args);
+    va_end(args);
+    assert(out_len >= sizeof(buf));
+  }
+#endif
+
   if (out_len >= sizeof(buf)) {
     const int requested_len = out_len;
     /* The output was truncated. Note that vsnprintf's return value