Commit 56fbd5cf authored by Andy Polyakov's avatar Andy Polyakov Committed by Richard Levitte
Browse files

bio/bss_file.c: since VS2015 one can't tell apart own and "alien" FILE 


pointers, except for minimal std[in|out|err].

(cherry picked from commit 800b299b)
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2701)
parent 6cc190f9

crypto/bio/bss_file.c

+5 −2
Original line number Diff line number Diff line
@@ -318,8 +318,11 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
#   if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)

#    define _IOB_ENTRIES 20

#   endif

#   if defined(_IOB_ENTRIES)

        /* Safety net to catch purely internal BIO_set_fp calls */

#   if defined(_MSC_VER) && _MSC_VER>=1900

        if (ptr == stdin || ptr == stdout || ptr == stderr)

            BIO_clear_flags(b, BIO_FLAGS_UPLINK);

#   elif defined(_IOB_ENTRIES)

        if ((size_t)ptr >= (size_t)stdin &&

            (size_t)ptr < (size_t)(stdin + _IOB_ENTRIES))

            BIO_clear_flags(b, BIO_FLAGS_UPLINK);