From 07474b6062e1bbed3be41e6d5f7ac9795e281920 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 25 Oct 2012 15:23:49 +0200 Subject: [PATCH] libtnc can be initialized more than once --- src/libtnccs/tnc/tnc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libtnccs/tnc/tnc.c b/src/libtnccs/tnc/tnc.c index feded3b2c..728d2b28d 100644 --- a/src/libtnccs/tnc/tnc.c +++ b/src/libtnccs/tnc/tnc.c @@ -40,6 +40,11 @@ struct private_tnc_t { * Public members of tnc_t. */ tnc_t public; + + /** + * Number of times we have been initialized + */ + refcount_t ref; }; /** @@ -54,9 +59,17 @@ void libtnccs_init(void) { private_tnc_t *this; + if (tnc) + { /* already initialized, increase refcount */ + this = (private_tnc_t*)tnc; + ref_get(&this->ref); + return; + } + INIT(this, .public = { }, + .ref = 1, ); tnc = &this->public; @@ -69,6 +82,11 @@ void libtnccs_deinit(void) { private_tnc_t *this = (private_tnc_t*)tnc; + if (!this || !ref_put(&this->ref)) + { /* have more users */ + return; + } + free(this); tnc = NULL; }