diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-04-03 19:56:15 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-04-03 19:56:15 +0100 |
| commit | 6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (patch) | |
| tree | 3612c90af5d656357045e107ccac556863e929a3 /ext/zip/lib/zip_source_win32w.c | |
| parent | df85331220ac60391d5f8d82c42a6c699f47fca1 (diff) | |
| parent | 80015ba741fc857074050086db6c7b2a4716d6d5 (diff) | |
| download | php-git-6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a.tar.gz | |
Merge branch 'openssl_error_store' of github.com:bukka/php-src into openssl_error_store
Diffstat (limited to 'ext/zip/lib/zip_source_win32w.c')
| -rw-r--r-- | ext/zip/lib/zip_source_win32w.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/zip/lib/zip_source_win32w.c b/ext/zip/lib/zip_source_win32w.c index 34134561f1..551aba5f37 100644 --- a/ext/zip/lib/zip_source_win32w.c +++ b/ext/zip/lib/zip_source_win32w.c @@ -1,6 +1,6 @@ /* zip_source_win32w.c -- create data source from Windows file (UTF-16) -Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner +Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at <libzip@nih.at> @@ -32,7 +32,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <errno.h> #include <stdio.h> #include "zipint.h" @@ -100,7 +99,7 @@ _win32_create_temp_w(_zip_source_win32_read_file_t *ctx, void **temp, zip_uint32 return INVALID_HANDLE_VALUE; } } - if (swprintf((wchar_t *)*temp, len, L"%s.%08x", (const wchar_t *)ctx->fname, value) != len - 1) { + if (_snwprintf((wchar_t *)*temp, len, L"%s.%08x", (const wchar_t *)ctx->fname, value) != len - 1) { return INVALID_HANDLE_VALUE; } |