projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
perl.c
diff --git
a/src/perl.c
b/src/perl.c
index
1ce09f4
..
3b498f9
100644
(file)
--- 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)
/* the ithread no longer exists */
if (NULL == t)
+ {
+ pthread_mutex_unlock (&perl_threads->mutex);
return;
return;
+ }
c_ithread_destroy (ithread);
c_ithread_destroy (ithread);
@@
-2515,7
+2518,10
@@
static int perl_config (oconfig_item_t *ci)
int current_status = 0;
if (NULL != perl_threads)
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);
if (0 == strcasecmp (c->key, "LoadPlugin"))
current_status = perl_config_loadplugin (aTHX_ c);