PATCH: untaint method for IO::Handle, 5.003_06 version

[p5sagit/p5-mst-13.2.git] / regexec.c

diff --git a/regexec.c b/regexec.c
index 6a29d7f..1ee1436 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -590,7 +590,7 @@ char *prog;
 #define sayNO goto no
 #define saySAME(x) if (x) goto yes; else goto no
        if (regnarrate) {
-           fprintf(stderr, "%*s%2d%-8.8s\t<%.10s>\n", regindent*2, "",
+           PerlIO_printf(Perl_debug_log, "%*s%2d%-8.8s\t<%.10s>\n", regindent*2, "",
                scan - regprogram, regprop(scan), locinput);
        }
 #else
@@ -668,7 +668,7 @@ char *prog;
                sayNO;
            if (regeol - locinput < ln)
                sayNO;
-           if (ln > 1 && bcmp(s, locinput, ln) != 0)
+           if (ln > 1 && memcmp(s, locinput, ln) != 0)
                sayNO;
            locinput += ln;
            nextchar = *locinput;
@@ -748,7 +748,7 @@ char *prog;
            ln = regendp[n] - s;
            if (locinput + ln > regeol)
                sayNO;
-           if (ln > 1 && bcmp(s, locinput, ln) != 0)
+           if (ln > 1 && memcmp(s, locinput, ln) != 0)
                sayNO;
            locinput += ln;
            nextchar = *locinput;
@@ -806,7 +806,7 @@ char *prog;
 
 #ifdef DEBUGGING
                if (regnarrate)
-                   fprintf(stderr, "%*s  %d  %lx\n", regindent*2, "",
+                   PerlIO_printf(Perl_debug_log, "%*s  %d  %lx\n", regindent*2, "",
                        n, (long)cc);
 #endif
 
@@ -986,7 +986,7 @@ char *prog;
                sayNO;
            break;
        default:
-           fprintf(stderr, "%x %d\n",(unsigned)scan,scan[1]);
+           PerlIO_printf(PerlIO_stderr(), "%x %d\n",(unsigned)scan,scan[1]);
            FAIL("regexp memory corruption");
        }
        scan = next;