X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fperl.c;h=19ac08d4274156c168a1c2f0bd7a8d461a55acfc;hb=aedf67e69cbe93a6925fd1004a7c8b990aed4b0a;hp=1ce09f4df19c963849175595096fd6a4d6fb6af4;hpb=59547eb66a3743ca0b458222d7a4318f3e659a60;p=collectd.git

diff --git a/src/perl.c b/src/perl.c
index 1ce09f4d..19ac08d4 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -1208,7 +1208,10 @@ static void c_ithread_destructor (void *arg)
 
 	/* the ithread no longer exists */
 	if (NULL == t)
+	{
+		pthread_mutex_unlock (&perl_threads->mutex);
 		return;
+	}
 
 	c_ithread_destroy (ithread);
 
@@ -2082,7 +2085,7 @@ static int perl_shutdown (void)
 		return 0;
 
 	if (NULL == aTHX) {
-		c_ithread_t *t = NULL;
+		t = NULL;
 
 		pthread_mutex_lock (&perl_threads->mutex);
 		t = c_ithread_create (perl_threads->head->interp);
@@ -2515,7 +2518,10 @@ static int perl_config (oconfig_item_t *ci)
 		int current_status = 0;
 
 		if (NULL != perl_threads)
-			aTHX = PERL_GET_CONTEXT;
+		{
+			if ((aTHX = PERL_GET_CONTEXT) == NULL)
+				return -1;
+		}
 
 		if (0 == strcasecmp (c->key, "LoadPlugin"))
 			current_status = perl_config_loadplugin (aTHX_ c);