pp_sys.c; Use memchr instead of strchr

This allows things to work properly in the face of embedded NULs.
See the branch merge message for more information.

1 files changed, 2 insertions, 1 deletions

diff --git a/pp_sys.c b/pp_sys.c
index 6d4dd86b7f..cd4deb803c 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -1509,10 +1509,11 @@ PP(pp_leavewrite)
 	if (IoFLAGS(io) & IOf_DIDTOP) {	/* Oh dear.  It still doesn't fit. */
 	    I32 lines = IoLINES_LEFT(io);
 	    const char *s = SvPVX_const(PL_formtarget);
+            const char *e = SvEND(PL_formtarget);
 	    if (lines <= 0)		/* Yow, header didn't even fit!!! */
 		goto forget_top;
 	    while (lines-- > 0) {
-		s = strchr(s, '\n');
+		s = (char *) memchr(s, '\n', e - s);
 		if (!s)
 		    break;
 		s++;