Avoid leaking memory in thread_hash (and enable memory leak detection

[oweals/openssl.git] / crypto / err / err.h

diff --git a/crypto/err/err.h b/crypto/err/err.h
index 131372c91bd1cc624bbdfc56fbbaddb1acafd241..eb62af2af8e87c76f0239e0b4a05fb161cb7d63d 100644 (file)
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -123,6 +123,7 @@ typedef struct err_state_st
 #define ERR_LIB_X509V3         34
 #define ERR_LIB_PKCS12         35
 #define ERR_LIB_RAND           36
+#define ERR_LIB_DSO            37
 
 #define ERR_LIB_USER           128
 
@@ -151,6 +152,7 @@ typedef struct err_state_st
 #define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),ERR_file_name,__LINE__)
 #define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),ERR_file_name,__LINE__)
 #define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),ERR_file_name,__LINE__)
+#define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),ERR_file_name,__LINE__)
 
 /* Borland C seems too stupid to be able to shift and do longs in
  * the pre-processor :-( */
@@ -199,6 +201,7 @@ typedef struct err_state_st
 #define ERR_R_BIO_LIB  ERR_LIB_BIO
 #define ERR_R_PKCS7_LIB        ERR_LIB_PKCS7
 #define ERR_R_PKCS12_LIB ERR_LIB_PKCS12
+#define ERR_R_DSO_LIB  ERR_LIB_DSO
 
 /* fatal error */
 #define        ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
@@ -230,6 +233,7 @@ unsigned long ERR_peek_error_line_data(const char **file,int *line,
                                       const char **data,int *flags);
 void ERR_clear_error(void );
 char *ERR_error_string(unsigned long e,char *buf);
+void ERR_error_string_n(unsigned long e, char *buf, size_t len);
 const char *ERR_lib_error_string(unsigned long e);
 const char *ERR_func_error_string(unsigned long e);
 const char *ERR_reason_error_string(unsigned long e);
@@ -241,22 +245,20 @@ void ERR_print_errors(BIO *bp);
 void ERR_add_error_data(int num, ...);
 #endif
 void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void );
-void ERR_load_crypto_strings(void );
-void ERR_free_strings(void );
+void ERR_load_ERR_strings(void);
+void ERR_load_crypto_strings(void);
+void ERR_free_strings(void);
 
 void ERR_remove_state(unsigned long pid); /* if zero we look it up */
 ERR_STATE *ERR_get_state(void);
 
 #ifdef HEADER_LHASH_H
-LHASH *ERR_get_string_table(void );
-LHASH *ERR_get_err_state_table(void );
-#else
-char *ERR_get_string_table(void );
-char *ERR_get_err_state_table(void );
+LHASH *ERR_get_string_table(void);
+LHASH *ERR_get_err_state_table(void); /* even less thread-safe than
+                                      * ERR_get_string_table :-) */
 #endif
 
-int ERR_get_next_error_library(void );
+int ERR_get_next_error_library(void);
 
 #ifdef __cplusplus
 }