summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/plugins/scripts/perl/weechat-perl.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 70c80b3c6..b94aaa8de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
FlashCode <flashcode@flashtux.org>
-v0.3.2-dev, 2010-02-26
+v0.3.2-dev, 2010-02-27
Version 0.3.2 (under dev!)
@@ -33,6 +33,8 @@ Version 0.3.2 (under dev!)
* api: fix "inactivity" value when no key has been pressed since WeeChat started
(bug #28930)
* scripts: allow script commands to reload only one script
+* perl: fix crash when callbacks are called during script initialization
+ (bug #29018)
* irc: add SASL authentication, with PLAIN and DH-BLOWFISH mechanisms
(task #8829)
* irc: fix crash with SSL connection if option ssl_cert is set (bug #28752)
diff --git a/src/plugins/scripts/perl/weechat-perl.c b/src/plugins/scripts/perl/weechat-perl.c
index 50ee2845b..15a741545 100644
--- a/src/plugins/scripts/perl/weechat-perl.c
+++ b/src/plugins/scripts/perl/weechat-perl.c
@@ -148,7 +148,8 @@ weechat_perl_exec (struct t_plugin_script *script,
(void) length;
func = (char *) function;
old_context = PERL_GET_CONTEXT;
- PERL_SET_CONTEXT (script->interpreter);
+ if (script->interpreter)
+ PERL_SET_CONTEXT (script->interpreter);
#else
length = strlen (script->interpreter) + strlen (function) + 3;
func = (char *) malloc (length);