Oops, wrong version...

[openssl.git] / crypto / err / err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 04773d65a69fd87cdf84c21f83cb11d75c2f0599..e28ec56ffa6a82ffc165cb9b58a9dfee3a6015d0 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -166,6 +166,7 @@ static ERR_STRING_DATA ERR_str_functs[]=
        {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
 #endif
        {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
+       {ERR_PACK(0,SYS_F_FREAD,0),             "fread"},
        {0,NULL},
        };
 
@@ -207,9 +208,11 @@ static ERR_STRING_DATA ERR_str_reasons[]=
 {ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED     ,"called a function you should not call"},
 {ERR_R_PASSED_NULL_PARAMETER           ,"passed a null parameter"},
 {ERR_R_INTERNAL_ERROR                  ,"internal error"},
+{ERR_R_DISABLED                                ,"called a function that was disabled at compile-time"},
 
 {0,NULL},
        };
+#endif
 
 
 /* Define the predeclared (but externally opaque) "ERR_FNS" type */
@@ -223,6 +226,7 @@ struct st_ERR_FNS
        ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
        /* Works on the "thread_hash" error-state table */
        LHASH *(*cb_thread_get)(int create);
+       void (*cb_thread_release)(LHASH **hash);
        ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
        ERR_STATE *(*cb_thread_set_item)(ERR_STATE *);
        void (*cb_thread_del_item)(const ERR_STATE *);
@@ -237,6 +241,7 @@ static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
 static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
 static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
 static LHASH *int_thread_get(int create);
+static void int_thread_release(LHASH **hash);
 static ERR_STATE *int_thread_get_item(const ERR_STATE *);
 static ERR_STATE *int_thread_set_item(ERR_STATE *);
 static void int_thread_del_item(const ERR_STATE *);
@@ -250,6 +255,7 @@ static const ERR_FNS err_defaults =
        int_err_set_item,
        int_err_del_item,
        int_thread_get,
+       int_thread_release,
        int_thread_get_item,
        int_thread_set_item,
        int_thread_del_item,
@@ -269,6 +275,7 @@ static const ERR_FNS *err_fns = NULL;
  * and state in the loading application. */
 static LHASH *int_error_hash = NULL;
 static LHASH *int_thread_hash = NULL;
+static int int_thread_hash_references = 0;
 static int int_err_library_number= ERR_LIB_USER;
 
 /* Internal function that checks whether "err_fns" is set and if not, sets it to
@@ -415,11 +422,37 @@ static LHASH *int_thread_get(int create)
                CRYPTO_pop_info();
                }
        if (int_thread_hash)
+               {
+               int_thread_hash_references++;
                ret = int_thread_hash;
+               }
        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
        return ret;
        }
 
+static void int_thread_release(LHASH **hash)
+       {
+       int i;
+
+       if (hash == NULL || *hash == NULL)
+               return;
+
+       i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR);
+
+#ifdef REF_PRINT
+       fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR");
+#endif
+       if (i > 0) return;
+#ifdef REF_CHECK
+       if (i < 0)
+               {
+               fprintf(stderr,"int_thread_release, bad reference count\n");
+               abort(); /* ok */
+               }
+#endif
+       *hash = NULL;
+       }
+
 static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
        {
        ERR_STATE *p;
@@ -434,6 +467,7 @@ static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
        p = (ERR_STATE *)lh_retrieve(hash, d);
        CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
 
+       ERRFN(thread_release)(&hash);
        return p;
        }
 
@@ -451,6 +485,7 @@ static ERR_STATE *int_thread_set_item(ERR_STATE *d)
        p = (ERR_STATE *)lh_insert(hash, d);
        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
+       ERRFN(thread_release)(&hash);
        return p;
        }
 
@@ -467,13 +502,15 @@ static void int_thread_del_item(const ERR_STATE *d)
        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
        p = (ERR_STATE *)lh_delete(hash, d);
        /* make sure we don't leak memory */
-       if (int_thread_hash && (lh_num_items(int_thread_hash) == 0))
+       if (int_thread_hash_references == 1
+               && int_thread_hash && (lh_num_items(int_thread_hash) == 0))
                {
                lh_free(int_thread_hash);
                int_thread_hash = NULL;
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
 
+       ERRFN(thread_release)(&hash);
        if (p)
                ERR_STATE_free(p);
        }
@@ -490,6 +527,7 @@ static int int_err_get_next_lib(void)
        }
 
 
+#ifndef OPENSSL_NO_ERR
 #define NUM_SYS_STR_REASONS 127
 #define LEN_SYS_STR_REASON 32
 
@@ -544,13 +582,24 @@ static void build_SYS_str_reasons()
 #endif
 
 #define err_clear_data(p,i) \
+       do { \
        if (((p)->err_data[i] != NULL) && \
                (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
                {  \
                OPENSSL_free((p)->err_data[i]); \
                (p)->err_data[i]=NULL; \
                } \
-       (p)->err_data_flags[i]=0;
+       (p)->err_data_flags[i]=0; \
+       } while(0)
+
+#define err_clear(p,i) \
+       do { \
+       (p)->err_flags[i]=0; \
+       (p)->err_buffer[i]=0; \
+       err_clear_data(p,i); \
+       (p)->err_file[i]=NULL; \
+       (p)->err_line[i]= -1; \
+       } while(0)
 
 static void ERR_STATE_free(ERR_STATE *s)
        {
@@ -641,6 +690,7 @@ void ERR_put_error(int lib, int func, int reason, const char *file,
        es->top=(es->top+1)%ERR_NUM_ERRORS;
        if (es->top == es->bottom)
                es->bottom=(es->bottom+1)%ERR_NUM_ERRORS;
+       es->err_flags[es->top]=0;
        es->err_buffer[es->top]=ERR_PACK(lib,func,reason);
        es->err_file[es->top]=file;
        es->err_line[es->top]=line;
@@ -656,10 +706,7 @@ void ERR_clear_error(void)
 
        for (i=0; i<ERR_NUM_ERRORS; i++)
                {
-               es->err_buffer[i]=0;
-               err_clear_data(es,i);
-               es->err_file[i]=NULL;
-               es->err_line[i]= -1;
+               err_clear(es,i);
                }
        es->top=es->bottom=0;
        }
@@ -842,6 +889,12 @@ LHASH *ERR_get_err_state_table(void)
        return ERRFN(thread_get)(0);
        }
 
+void ERR_release_err_state_table(LHASH **hash)
+       {
+       err_fns_check();
+       ERRFN(thread_release)(hash);
+       }
+
 const char *ERR_lib_error_string(unsigned long e)
        {
        ERR_STRING_DATA d,*p;
@@ -1022,7 +1075,7 @@ void ERR_add_error_data(int num, ...)
                                else
                                        str=p;
                                }
-                       strcat(str,a);
+                       BUF_strlcat(str,a,s+1);
                        }
                }
        ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
@@ -1030,3 +1083,33 @@ void ERR_add_error_data(int num, ...)
 err:
        va_end(args);
        }
+
+int ERR_set_mark(void)
+       {
+       ERR_STATE *es;
+
+       es=ERR_get_state();
+
+       if (es->bottom == es->top) return 0;
+       es->err_flags[es->top]|=ERR_FLAG_MARK;
+       return 1;
+       }
+
+int ERR_pop_to_mark(void)
+       {
+       ERR_STATE *es;
+
+       es=ERR_get_state();
+
+       while(es->bottom != es->top
+               && (es->err_flags[es->top] & ERR_FLAG_MARK) == 0)
+               {
+               err_clear(es,es->top);
+               es->top-=1;
+               if (es->top == -1) es->top=ERR_NUM_ERRORS;
+               }
+               
+       if (es->bottom == es->top) return 0;
+       es->err_flags[es->top]&=~ERR_FLAG_MARK;
+       return 1;
+       }