blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash in weechat_perl_exec() after unloading a Perl script

Browse Source
This commit is contained in:
Sebastien Helleu 2008-11-05 12:36:17 +01:00
parent bc0237cd0d
commit bffe879db8
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/scripts/perl/weechat-perl.c
View File

@ -117,7 +117,8 @@ weechat_perl_exec (struct t_plugin_script *script,
void *ret_value; void *ret_value;
int *ret_i, mem_err, length; int *ret_i, mem_err, length;
SV *ret_s; SV *ret_s;
struct t_plugin_script *old_perl_current_script;
perl_current_script = script;
/* this code is placed here to conform ISO C90 */ /* this code is placed here to conform ISO C90 */
dSP; dSP;
@ -138,12 +139,6 @@ weechat_perl_exec (struct t_plugin_script *script,
SAVETMPS; SAVETMPS;
PUSHMARK(sp); PUSHMARK(sp);
old_perl_current_script = perl_current_script;
/* are we loading the script file ? */
if (strcmp (function, "weechat_perl_load_eval_file") != 0)
perl_current_script = script;
count = perl_call_argv (func, G_EVAL | G_SCALAR, argv); count = perl_call_argv (func, G_EVAL | G_SCALAR, argv);
ret_value = NULL; ret_value = NULL;
mem_err = 1; mem_err = 1;
@ -214,15 +209,6 @@ weechat_perl_exec (struct t_plugin_script *script,
return NULL; return NULL;
} }
if (strcmp (function, "weechat_perl_load_eval_file") != 0)
{
perl_current_script = old_perl_current_script;
#ifdef MULTIPLICITY
if (perl_current_script)
PERL_SET_CONTEXT (perl_current_script->interpreter);
#endif
}
return ret_value; return ret_value;
} }