aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/bio/bss_file.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-13 07:49:50 +0000
committermarha <marha@users.sourceforge.net>2011-04-13 07:49:50 +0000
commit7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06 (patch)
treed5d217cd4d21932fa490076d0dea9a259a9a8a31 /openssl/crypto/bio/bss_file.c
parent125aba11ec484309e4dc5b2abf1b15ac98784159 (diff)
downloadvcxsrv-7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06.tar.gz
vcxsrv-7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06.tar.bz2
vcxsrv-7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06.zip
Updated to openssl-1.0.0d
Diffstat (limited to 'openssl/crypto/bio/bss_file.c')
-rw-r--r--openssl/crypto/bio/bss_file.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/openssl/crypto/bio/bss_file.c b/openssl/crypto/bio/bss_file.c
index 8bfa0bcd9..b954fe7eb 100644
--- a/openssl/crypto/bio/bss_file.c
+++ b/openssl/crypto/bio/bss_file.c
@@ -123,6 +123,7 @@ BIO *BIO_new_file(const char *filename, const char *mode)
#if defined(_WIN32) && defined(CP_UTF8)
int sz, len_0 = (int)strlen(filename)+1;
+ DWORD flags;
/*
* Basically there are three cases to cover: a) filename is
@@ -136,17 +137,22 @@ BIO *BIO_new_file(const char *filename, const char *mode)
* ERROR_NO_UNICODE_TRANSLATION, in which case we fall
* back to fopen...
*/
- if ((sz=MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+ if ((sz=MultiByteToWideChar(CP_UTF8,(flags=MB_ERR_INVALID_CHARS),
+ filename,len_0,NULL,0))>0 ||
+ (GetLastError()==ERROR_INVALID_FLAGS &&
+ (sz=MultiByteToWideChar(CP_UTF8,(flags=0),
filename,len_0,NULL,0))>0)
+ )
{
WCHAR wmode[8];
WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
- if (MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+ if (MultiByteToWideChar(CP_UTF8,flags,
filename,len_0,wfilename,sz) &&
MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
wmode,sizeof(wmode)/sizeof(wmode[0])) &&
- (file=_wfopen(wfilename,wmode))==NULL && errno==ENOENT
+ (file=_wfopen(wfilename,wmode))==NULL &&
+ (errno==ENOENT || errno==EBADF)
) /* UTF-8 decode succeeded, but no file, filename
* could still have been locale-ized... */
file = fopen(filename,mode);