projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
receive flow processing
[exim.git]
/
src
/
src
/
perl.c
diff --git
a/src/src/perl.c
b/src/src/perl.c
index 543b5d27d1713cd6bc1bc103934c417003252cea..92218a6efb1e5d33ba9c5289dc53a9b7e9337a03 100644
(file)
--- a/
src/src/perl.c
+++ b/
src/src/perl.c
@@
-13,6
+13,7
@@
/* This Perl add-on can be distributed under the same terms as Exim itself. */
/* See the file NOTICE for conditions of use and distribution. */
/* This Perl add-on can be distributed under the same terms as Exim itself. */
/* See the file NOTICE for conditions of use and distribution. */
+#include <assert.h>
#include "exim.h"
#define EXIM_TRUE TRUE
#include "exim.h"
#define EXIM_TRUE TRUE
@@
-95,11
+96,17
@@
static void xs_init(pTHX)
uschar *
init_perl(uschar *startup_code)
{
uschar *
init_perl(uschar *startup_code)
{
- static int argc =
2
;
- static char *argv[
3] = { "exim-perl", "/dev/null", 0
};
+ static int argc =
1
;
+ static char *argv[
4] = { "exim-perl"
};
SV *sv;
STRLEN len;
SV *sv;
STRLEN len;
+ if (opt_perl_taintmode) argv[argc++] = "-T";
+ argv[argc++] = "/dev/null";
+ argv[argc] = 0;
+
+ assert(sizeof(argv)/sizeof(argv[0]) > argc);
+
if (interp_perl) return 0;
interp_perl = perl_alloc();
perl_construct(interp_perl);
if (interp_perl) return 0;
interp_perl = perl_alloc();
perl_construct(interp_perl);
@@
-179,7
+186,7
@@
call_perl_cat(uschar *yield, int *sizep, int *ptrp, uschar **errstrp,
return NULL;
}
str = US SvPV(sv, len);
return NULL;
}
str = US SvPV(sv, len);
- yield = string_cat(yield, sizep, ptrp, str, (int)len);
+ yield = string_cat
n
(yield, sizep, ptrp, str, (int)len);
FREETMPS;
LEAVE;
FREETMPS;
LEAVE;