Change 19874 by [EMAIL PROTECTED] on 2003/06/28 17:30:52
Retract #19867; the bug was really much simpler:
the < max must be <= max instead.
Affected files ...
... //depot/perl/hv.c#134 edit
Differences ...
==== //depot/perl/hv.c#134 (text) ====
Index: perl/hv.c
--- perl/hv.c#133~19867~ Fri Jun 27 03:08:20 2003
+++ perl/hv.c Sat Jun 28 10:30:52 2003
@@ -1707,27 +1707,25 @@
if (SvREADONLY(hv)) {
/* restricted hash: convert all keys to placeholders */
- HE* he;
-
- hv_iterinit(hv);
- while ((he = hv_iternext_flags(hv, HV_ITERNEXT_WANTPLACEHOLDERS))) {
- SV *val;
-
- val = hv_iterval(hv, he);
- if (val != &PL_sv_undef) { /* not already placeholder */
- if (val && SvREADONLY(val)) {
- SV* keysv = hv_iterkeysv(he);
-
- Perl_croak(aTHX_
- "Attempt to delete readonly key '%"SVf"' from a
restricted hash",
- keysv);
- }
- SvREFCNT_dec(val);
- HeVAL(he) = &PL_sv_undef;
- xhv->xhv_placeholders++; /* HvPLACEHOLDERS(hv)++ */
+ I32 i;
+ HE* entry;
+ for (i = 0; i <= (I32) xhv->xhv_max; i++) {
+ entry = ((HE**)xhv->xhv_array)[i];
+ for (; entry; entry = HeNEXT(entry)) {
+ /* not already placeholder */
+ if (HeVAL(entry) != &PL_sv_undef) {
+ if (HeVAL(entry) && SvREADONLY(HeVAL(entry))) {
+ SV* keysv = hv_iterkeysv(entry);
+ Perl_croak(aTHX_
+ "Attempt to delete readonly key '%"SVf"' from a restricted hash",
+ keysv);
+ }
+ SvREFCNT_dec(HeVAL(entry));
+ HeVAL(entry) = &PL_sv_undef;
+ xhv->xhv_placeholders++; /* HvPLACEHOLDERS(hv)++ */
+ }
}
}
- hv_iterinit(hv);
return;
}
End of Patch.
