diff options
author | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
commit | 73d82f7ac0d1add2697128c2e26c2432ffe172a5 (patch) | |
tree | c6436b57a2191c57320396c37449109ebad745ec /openssl/ms | |
parent | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (diff) | |
parent | 60adbfdea1ee754341d64454274e7aa83bae8971 (diff) | |
download | vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.gz vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.bz2 vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/ms')
-rw-r--r-- | openssl/ms/uplink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/ms/uplink.c b/openssl/ms/uplink.c index 7b7da08d4..6d59cb1f8 100644 --- a/openssl/ms/uplink.c +++ b/openssl/ms/uplink.c @@ -40,7 +40,8 @@ void OPENSSL_Uplink (volatile void **table, int index) * should be sufficient [it prohibits compiler to reorder memory * access instructions]. */ do { - len = _stprintf (msg,_T("OPENSSL_Uplink(%p,%02X): "),table,index); + len = _sntprintf (msg,sizeof(msg)/sizeof(TCHAR), + _T("OPENSSL_Uplink(%p,%02X): "),table,index); _tcscpy (msg+len,_T("unimplemented function")); if ((h=apphandle)==NULL) |