backtrace->contains_function takes multiple names, speeding up whitelist check drasti...

diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c
index a6724519427324af6b2f3dc40d5e69b423c8f62c..41224e8c2b21e0c28930636f1aba58aad08557f5 100644 (file)
--- a/src/libstrongswan/utils/backtrace.c
+++ b/src/libstrongswan/utils/backtrace.c
@@ -132,10 +132,11 @@ static void log_(private_backtrace_t *this, FILE *file, bool detailed)
 /**
  * Implementation of backtrace_t.contains_function
  */
-static bool contains_function(private_backtrace_t *this, char *function)
+static bool contains_function(private_backtrace_t *this,
+                                                         char *function[], int count)
 {
 #ifdef HAVE_DLADDR
-       int i;
+       int i, j;
 
        for (i = 0; i< this->frame_count; i++)
        {
@@ -143,9 +144,12 @@ static bool contains_function(private_backtrace_t *this, char *function)
 
                if (dladdr(this->frames[i], &info) && info.dli_sname)
                {
-                       if (streq(info.dli_sname, function))
+                       for (j = 0; j < count; j++)
                        {
-                               return TRUE;
+                               if (streq(info.dli_sname, function[j]))
+                               {
+                                       return TRUE;
+                               }
                        }
                }
        }
@@ -179,7 +183,7 @@ backtrace_t *backtrace_create(int skip)
        this->frame_count = frame_count;
 
        this->public.log = (void(*)(backtrace_t*,FILE*,bool))log_;
-       this->public.contains_function = (bool(*)(backtrace_t*, char *function))contains_function;
+       this->public.contains_function = (bool(*)(backtrace_t*, char *function[], int count))contains_function;
        this->public.destroy = (void(*)(backtrace_t*))destroy;
 
        return &this->public;

diff --git a/src/libstrongswan/utils/backtrace.h b/src/libstrongswan/utils/backtrace.h
index c6b0ec78f3acda30dc7a484e567a27c317e5e2ca..e8ccfc1bde133da6ec7dfc307bfdfff251895f5f 100644 (file)
--- a/src/libstrongswan/utils/backtrace.h
+++ b/src/libstrongswan/utils/backtrace.h
@@ -41,12 +41,13 @@ struct backtrace_t {
        void (*log)(backtrace_t *this, FILE *file, bool detailed);
 
        /**
-        * Check if the backtrace contains a frame in a specific function.
+        * Check if the backtrace contains a frame having a function in a list.
         *
-        * @param               function name
-        * @return              TRUE if function is in the stack
+        * @param               function name array
+        * @param               number of elements in function array
+        * @return              TRUE if one of the functions is in the stack
         */
-       bool (*contains_function)(backtrace_t *this, char *function);
+       bool (*contains_function)(backtrace_t *this, char *function[], int count);
 
        /**
         * Destroy a backtrace instance.

diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c
index acd8b7c3a430384e4f3c854be534a1de68b7166c..a645610ca96cbbb65ef470b47a31e94190e60201 100644 (file)
--- a/src/libstrongswan/utils/leak_detective.c
+++ b/src/libstrongswan/utils/leak_detective.c
@@ -232,22 +232,6 @@ char *whitelist[] = {
        "gpg_err_init",
 };
 
-/**
- * check if a stack frame contains functions listed above
- */
-static bool is_whitelisted(backtrace_t *backtrace)
-{
-       int i;
-       for (i = 0; i < sizeof(whitelist)/sizeof(char*); i++)
-       {
-               if (backtrace->contains_function(backtrace, whitelist[i]))
-               {
-                       return TRUE;
-               }
-       }
-       return FALSE;
-}
-
 /**
  * Report leaks at library destruction
  */
@@ -260,7 +244,8 @@ static void report(private_leak_detective_t *this, bool detailed)
 
                for (hdr = first_header.next; hdr != NULL; hdr = hdr->next)
                {
-                       if (is_whitelisted(hdr->backtrace))
+                       if (hdr->backtrace->contains_function(hdr->backtrace,
+                                                                                       whitelist, countof(whitelist)))
                        {
                                whitelisted++;
                        }