Merge maint-5.004 branch (5.004_04) with mainline.

p4raw-id: //depot/perl@137

1 files changed, 5 insertions, 2 deletions

diff --git a/hv.c b/hv.c
index 1e2c81b872..50ff060e36 100644
--- a/hv.c
+++ b/hv.c
@@ -889,7 +889,7 @@ HV *hv;
     }
     xhv->xhv_riter = -1;
     xhv->xhv_eiter = Null(HE*);
-    return xhv->xhv_fill;
+    return xhv->xhv_fill;	/* should be xhv->xhv_keys? May change later */
 }
 
 HE *
@@ -966,7 +966,10 @@ register HE *entry;
 I32 *retlen;
 {
     if (HeKLEN(entry) == HEf_SVKEY) {
-	return SvPV(HeKEY_sv(entry), *(STRLEN*)retlen);
+	STRLEN len;
+	char *p = SvPV(HeKEY_sv(entry), len);
+	*retlen = len;
+	return p;
     }
     else {
 	*retlen = HeKLEN(entry);