Fix problems with each() on tied hashes.

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

diff --git a/doop.c b/doop.c
index 42a5a0c..470ec06 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -32,22 +32,22 @@ SV *sv;
 OP *arg;
 {
     register short *tbl;
-    register char *s;
-    register I32 matches = 0;
+    register U8 *s;
+    register U8 *send;
+    register U8 *d;
     register I32 ch;
-    register char *send;
-    register char *d;
+    register I32 matches = 0;
     register I32 squash = op->op_private & OPpTRANS_SQUASH;
     STRLEN len;
 
     if (SvREADONLY(sv))
        croak(no_modify);
-    tbl = (short*) cPVOP->op_pv;
-    s = SvPV(sv, len);
+    tbl = (short*)cPVOP->op_pv;
+    s = (U8*)SvPV(sv, len);
     if (!len)
        return 0;
     if (!SvPOKp(sv))
-       s = SvPV_force(sv, len);
+       s = (U8*)SvPV_force(sv, len);
     (void)SvPOK_only(sv);
     send = s + len;
     if (!tbl || !s)
@@ -55,7 +55,7 @@ OP *arg;
     DEBUG_t( deb("2.TBL\n"));
     if (!op->op_private) {
        while (s < send) {
-           if ((ch = tbl[*s & 0377]) >= 0) {
+           if ((ch = tbl[*s]) >= 0) {
                matches++;
                *s = ch;
            }
@@ -65,7 +65,7 @@ OP *arg;
     else {
        d = s;
        while (s < send) {
-           if ((ch = tbl[*s & 0377]) >= 0) {
+           if ((ch = tbl[*s]) >= 0) {
                *d = ch;
                if (matches++ && squash) {
                    if (d[-1] == *d)
@@ -82,7 +82,7 @@ OP *arg;
        }
        matches += send - d;    /* account for disappeared chars */
        *d = '\0';
-       SvCUR_set(sv, d - SvPVX(sv));
+       SvCUR_set(sv, d - (U8*)SvPVX(sv));
     }
     SvSETMAGIC(sv);
     return matches;
@@ -158,9 +158,9 @@ register SV **sarg;
     register char *t;
     register char *f;
     bool dolong;
-#ifdef QUAD
+#ifdef HAS_QUAD
     bool doquad;
-#endif /* QUAD */
+#endif /* HAS_QUAD */
     char ch;
     register char *send;
     register SV *arg;
@@ -189,9 +189,9 @@ register SV **sarg;
        f = t;
        *buf = '\0';
        xs = buf;
-#ifdef QUAD
+#ifdef HAS_QUAD
        doquad =
-#endif /* QUAD */
+#endif /* HAS_QUAD */
        dolong = FALSE;
        pre = post = 0;
        for (t++; t < send; t++) {
@@ -203,12 +203,15 @@ register SV **sarg;
                len++, sarg--;
                xlen = strlen(xs);
                break;
+           case 'n': case '*':
+               croak("Use of %c in printf format not supported", *t);
+
            case '0': case '1': case '2': case '3': case '4':
            case '5': case '6': case '7': case '8': case '9': 
            case '.': case '#': case '-': case '+': case ' ':
                continue;
            case 'l':
-#ifdef QUAD
+#ifdef HAS_QUAD
                if (dolong) {
                    dolong = FALSE;
                    doquad = TRUE;
@@ -236,9 +239,9 @@ register SV **sarg;
            case 'd':
                ch = *(++t);
                *t = '\0';
-#ifdef QUAD
+#ifdef HAS_QUAD
                if (doquad)
-                   (void)sprintf(buf,s,(quad)SvNV(arg));
+                   (void)sprintf(buf,s,(Quad_t)SvNV(arg));
                else
 #endif
                if (dolong)
@@ -254,9 +257,9 @@ register SV **sarg;
                ch = *(++t);
                *t = '\0';
                value = SvNV(arg);
-#ifdef QUAD
+#ifdef HAS_QUAD
                if (doquad)
-                   (void)sprintf(buf,s,(unsigned quad)value);
+                   (void)sprintf(buf,s,(unsigned Quad_t)value);
                else
 #endif
                if (dolong)
@@ -316,6 +319,10 @@ register SV **sarg;
            }
            /* end of switch, copy results */
            *t = ch;
+           if (xs == buf && xlen >= sizeof(buf)) {     /* Ooops! */
+               PerlIO_puts(PerlIO_stderr(),"panic: sprintf overflow - memory corrupted!\n");
+               my_exit(1);
+           }
            SvGROW(sv, SvCUR(sv) + (f - s) + xlen + 1 + pre + post);
            sv_catpvn(sv, s, f - s);
            if (pre) {
@@ -417,7 +424,7 @@ register SV *sv;
         return;
     }
     s = SvPV(sv, len);
-    if (len && !SvPOKp(sv))
+    if (len && !SvPOK(sv))
        s = SvPV_force(sv, len);
     if (s && len) {
        s += --len;
@@ -435,10 +442,13 @@ I32
 do_chomp(sv)
 register SV *sv;
 {
-    register I32 count = 0;
+    register I32 count;
     STRLEN len;
     char *s;
-    
+
+    if (RsSNARF(rs))
+       return 0;
+    count = 0;
     if (SvTYPE(sv) == SVt_PVAV) {
        register I32 i;
         I32 max;
@@ -465,7 +475,7 @@ register SV *sv;
        s = SvPV_force(sv, len);
     if (s && len) {
        s += --len;
-       if (rspara) {
+       if (RsPARA(rs)) {
            if (*s != '\n')
                goto nope;
            ++count;
@@ -475,21 +485,24 @@ register SV *sv;
                ++count;
            }
        }
-       else if (rslen == 1) {
-           if (*s != rschar)
-               goto nope;
-           ++count;
-       } 
        else {
-           if (len < rslen - 1)
-               goto nope;
-           len -= rslen - 1;
-           s -= rslen - 1;
-           if (bcmp(s, rs, rslen))
-               goto nope;
-           count += rslen;
+           STRLEN rslen;
+           char *rsptr = SvPV(rs, rslen);
+           if (rslen == 1) {
+               if (*s != *rsptr)
+                   goto nope;
+               ++count;
+           }
+           else {
+               if (len < rslen - 1)
+                   goto nope;
+               len -= rslen - 1;
+               s -= rslen - 1;
+               if (memcmp(s, rsptr, rslen))
+                   goto nope;
+               count += rslen;
+           }
        }
-
        *s = '\0';
        SvCUR_set(sv, len);
        SvNIOK_off(sv);
@@ -518,6 +531,8 @@ SV *right;
     register char *rc = SvPV(right, rightlen);
     register I32 len;
     I32 lensave;
+    char *lsave = lc;
+    char *rsave = rc;
 
     dc = SvPV_force(sv,na);
     len = leftlen < rightlen ? leftlen : rightlen;
@@ -575,9 +590,6 @@ SV *right;
     }
 #endif
     {
-       char *lsave = lc;
-       char *rsave = rc;
-       
        switch (optype) {
        case OP_BIT_AND:
            while (len--)
@@ -596,6 +608,8 @@ SV *right;
                sv_catpvn(sv, rsave + len, rightlen - len);
            else if (leftlen > len)
                sv_catpvn(sv, lsave + len, leftlen - len);
+           else
+               *SvEND(sv) = '\0';
            break;
        }
     }
@@ -607,9 +621,7 @@ dARGS
 {
     dSP;
     HV *hv = (HV*)POPs;
-    I32 i;
     register HE *entry;
-    char *tmps;
     SV *tmpstr;
     I32 dokeys =   (op->op_type == OP_KEYS);
     I32 dovalues = (op->op_type == OP_VALUES);
@@ -619,14 +631,17 @@ dARGS
 
     if (!hv)
        RETURN;
+
+    (void)hv_iterinit(hv);     /* always reset iterator regardless */
+
     if (GIMME != G_ARRAY) {
+       I32 i;
        dTARGET;
 
        if (!SvRMAGICAL(hv) || !mg_find((SV*)hv,'P'))
            i = HvKEYS(hv);
        else {
            i = 0;
-           (void)hv_iterinit(hv);
            /*SUPPRESS 560*/
            while (entry = hv_iternext(hv)) {
                i++;
@@ -639,26 +654,20 @@ dARGS
     /* Guess how much room we need.  hv_max may be a few too many.  Oh well. */
     EXTEND(sp, HvMAX(hv) * (dokeys + dovalues));
 
-    (void)hv_iterinit(hv);
-
     PUTBACK;   /* hv_iternext and hv_iterval might clobber stack_sp */
     while (entry = hv_iternext(hv)) {
        SPAGAIN;
-       if (dokeys) {
-           tmps = hv_iterkey(entry,&i);        /* won't clobber stack_sp */
-           if (!i)
-               tmps = "";
-           XPUSHs(sv_2mortal(newSVpv(tmps,i)));
-       }
+       if (dokeys)
+           XPUSHs(hv_iterkeysv(entry));        /* won't clobber stack_sp */
        if (dovalues) {
            tmpstr = NEWSV(45,0);
            PUTBACK;
            sv_setsv(tmpstr,hv_iterval(hv,entry));
            SPAGAIN;
            DEBUG_H( {
-               sprintf(buf,"%d%%%d=%d\n",entry->hent_hash,
-                   HvMAX(hv)+1,entry->hent_hash & HvMAX(hv));
-               sv_setpv(tmpstr,buf);
+                       sprintf(buf,"%d%%%d=%d\n", HeHASH(entry),
+                               HvMAX(hv)+1, HeHASH(entry) & HvMAX(hv));
+                       sv_setpv(tmpstr,buf);
            } )
            XPUSHs(sv_2mortal(tmpstr));
        }