[people/pmueller/ipfire-2.x.git] / src / patches / perl-5.8.5-perlio_debug_security.patch

diff -uwr perl-5.8.5/perlio.c perl-5.8.5-patched/perlio.c
--- perl-5.8.5/perlio.c	2004-03-16 18:36:08.000000000 +0000
+++ perl-5.8.5-patched/perlio.c	2005-02-05 13:24:58.764830408 +0000
@@ -448,7 +448,7 @@
     va_list ap;
     dSYS;
     va_start(ap, fmt);
-    if (!dbg) {
+    if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
 	char *s = PerlEnv_getenv("PERLIO_DEBUG");
 	if (s && *s)
 	    dbg = PerlLIO_open3(s, O_WRONLY | O_CREAT | O_APPEND, 0666);
@@ -465,7 +465,7 @@
 	s = CopFILE(PL_curcop);
 	if (!s)
 	    s = "(none)";
-	sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
+	sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
 	len = strlen(buffer);
 	vsprintf(buffer+len, fmt, ap);
 	PerlLIO_write(dbg, buffer, strlen(buffer));
Only in perl-5.8.5-patched: perlio.c.orig
Commit	Line	Data
cd1a2927 MT	1	diff -uwr perl-5.8.5/perlio.c perl-5.8.5-patched/perlio.c
	2	--- perl-5.8.5/perlio.c 2004-03-16 18:36:08.000000000 +0000
	3	+++ perl-5.8.5-patched/perlio.c 2005-02-05 13:24:58.764830408 +0000
	4	@@ -448,7 +448,7 @@
	5	va_list ap;
	6	dSYS;
	7	va_start(ap, fmt);
	8	- if (!dbg) {
	9	+ if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
	10	char *s = PerlEnv_getenv("PERLIO_DEBUG");
	11	if (s && *s)
	12	dbg = PerlLIO_open3(s, O_WRONLY \| O_CREAT \| O_APPEND, 0666);
	13	@@ -465,7 +465,7 @@
	14	s = CopFILE(PL_curcop);
	15	if (!s)
	16	s = "(none)";
	17	- sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
	18	+ sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
	19	len = strlen(buffer);
	20	vsprintf(buffer+len, fmt, ap);
	21	PerlLIO_write(dbg, buffer, strlen(buffer));
	22	Only in perl-5.8.5-patched: perlio.c.orig