diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-05-23 18:33:00 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-23 18:38:46 +0200 |
| commit | 4cc77142e0292d5d00f20e62849139f4401895c8 (patch) | |
| tree | d19d858f3f27791781a879703951b9218f0c179f /src/libstrongswan/processing/processor.c | |
| parent | 4d0795bcefeb7d6156fda9b59e75a7dbe05de6e5 (diff) | |
| parent | a9b698f5be2519353d91cd6be52b97ce7f5d6fe6 (diff) | |
| download | strongswan-4cc77142e0292d5d00f20e62849139f4401895c8.tar.bz2 strongswan-4cc77142e0292d5d00f20e62849139f4401895c8.tar.xz | |
Merge branch 'fuzzing'
Adds support for fuzzing the certificate parser provided by the default
plugins (x509, pem, gmp etc.) on Google's OSS-Fuzz infrastructure (or
generally with libFuzzer). Fixes several issues that were found while
fuzzing these plugins.
When building the libraries monolithically and statically the
plugin constructors are now hard-coded in each library so the plugin
code is not removed by the linker because it thinks none of their symbols
are ever referenced.
Diffstat (limited to 'src/libstrongswan/processing/processor.c')
| -rw-r--r-- | src/libstrongswan/processing/processor.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c index 27e5ab5f6..bd8d534a5 100644 --- a/src/libstrongswan/processing/processor.c +++ b/src/libstrongswan/processing/processor.c @@ -429,7 +429,15 @@ METHOD(processor_t, execute_job, void, METHOD(processor_t, set_threads, void, private_processor_t *this, u_int count) { + int i; + this->mutex->lock(this->mutex); + for (i = 0; i < JOB_PRIO_MAX; i++) + { + this->prio_threads[i] = lib->settings->get_int(lib->settings, + "%s.processor.priority_threads.%N", 0, lib->ns, + job_priority_names, i); + } if (count > this->total_threads) { /* increase thread count */ worker_thread_t *worker; @@ -551,13 +559,10 @@ processor_t *processor_create() .job_added = condvar_create(CONDVAR_TYPE_DEFAULT), .thread_terminated = condvar_create(CONDVAR_TYPE_DEFAULT), ); + for (i = 0; i < JOB_PRIO_MAX; i++) { this->jobs[i] = linked_list_create(); - this->prio_threads[i] = lib->settings->get_int(lib->settings, - "%s.processor.priority_threads.%N", 0, lib->ns, - job_priority_names, i); } - return &this->public; } |