diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-09-04 15:34:43 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-09-04 15:34:43 +0000 |
| commit | bbb8de0966f0181498a0491f42d8b839778a93e7 (patch) | |
| tree | 5a645a6357da154d8a320950a302cdf6f1d7e793 /crypto/bio | |
| parent | 5e386163801a248063afbc9e346ab1b098356729 (diff) | |
Avoid abort() throughout the library, except when preprocessor
symbols for debugging are defined.
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bio_err.c | 6 | ||||
| -rw-r--r-- | crypto/bio/bio_lib.c | 2 | ||||
| -rw-r--r-- | crypto/bio/bss_conn.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c index 1d6a0e733f..fb99195471 100644 --- a/crypto/bio/bio_err.c +++ b/crypto/bio/bio_err.c @@ -105,7 +105,7 @@ static ERR_STRING_DATA BIO_str_reasons[]= {BIO_R_BAD_HOSTNAME_LOOKUP ,"bad hostname lookup"}, {BIO_R_BROKEN_PIPE ,"broken pipe"}, {BIO_R_CONNECT_ERROR ,"connect error"}, -{BIO_R_EOF_ON_MEMORY_BIO ,"eof on memory bio"}, +{BIO_R_EOF_ON_MEMORY_BIO ,"EOF on memory BIO"}, {BIO_R_ERROR_SETTING_NBIO ,"error setting nbio"}, {BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET,"error setting nbio on accepted socket"}, {BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET,"error setting nbio on accept socket"}, @@ -126,8 +126,8 @@ static ERR_STRING_DATA BIO_str_reasons[]= {BIO_R_UNABLE_TO_LISTEN_SOCKET ,"unable to listen socket"}, {BIO_R_UNINITIALIZED ,"uninitialized"}, {BIO_R_UNSUPPORTED_METHOD ,"unsupported method"}, -{BIO_R_WRITE_TO_READ_ONLY_BIO ,"write to read only bio"}, -{BIO_R_WSASTARTUP ,"wsastartup"}, +{BIO_R_WRITE_TO_READ_ONLY_BIO ,"write to read only BIO"}, +{BIO_R_WSASTARTUP ,"WSAStartup"}, {0,NULL} }; diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index d8cb83aaab..3b9f415fb2 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -206,7 +206,9 @@ int BIO_write(BIO *b, const void *in, int inl) * determine this is the reference count which is now invalid since * the memory has been free()ed. */ +#ifdef REF_CHECK if (b->references <= 0) abort(); +#endif if (cb != NULL) /* && (b->references >= 1)) */ i=(int)cb(b,BIO_CB_WRITE|BIO_CB_RETURN,in,inl, 0L,(long)i); diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 7ed26f358f..e092528b3e 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -188,7 +188,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) case BIO_CONN_S_GET_PORT: if (c->param_port == NULL) { - abort(); + /* abort(); */ goto exit_loop; } else if (BIO_get_port(c->param_port,&c->port) <= 0) @@ -299,7 +299,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) ret=1; goto exit_loop; default: - abort(); + /* abort(); */ goto exit_loop; } |