Better handling of printing NULL pointers

[user/henk/code/exim.git] / src / src / perl.c

diff --git a/src/src/perl.c b/src/src/perl.c
index fbe9ee8427dafb49e471647ab1dac7b1c8038ea2..5f4f0d98dcad7699173bad27b5762d381047de77 100644 (file)
--- a/src/src/perl.c
+++ b/src/src/perl.c
@@ -60,7 +60,7 @@ XS(xs_expand_string)
   str = expand_string(US SvPV(ST(0), len));
   ST(0) = sv_newmortal();
   if (str != NULL)
-    sv_setpv(ST(0), (const char *) str);
+    sv_setpv(ST(0), CCS  str);
   else if (!expand_string_forcedfail)
     croak("syntax error in Exim::expand_string argument: %s",
       expand_string_message);
@@ -186,7 +186,7 @@ call_perl_cat(uschar *yield, int *sizep, int *ptrp, uschar **errstrp,
     return NULL;
     }
   str = US SvPV(sv, len);
-  yield = string_cat(yield, sizep, ptrp, str, (int)len);
+  yield = string_catn(yield, sizep, ptrp, str, (int)len);
   FREETMPS;
   LEAVE;