X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.c;h=6c4f2ff84d8d64fdcf750fce115dc6e63bf33b94;hb=2d5a560e6257e98fbb384456cc2d9b09a6b228b7;hp=15bf3515b0c0710b609b655d63a3dec2c637d48f;hpb=58d76dfdf30230046d41beb912124c3381ef2bc8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.c b/pp.c
index 15bf351..6c4f2ff 100644
--- a/pp.c
+++ b/pp.c
@@ -3241,7 +3241,9 @@ PP(pp_ord)
         argsv = tmpsv;
     }
 
-    XPUSHu(DO_UTF8(argsv) ? utf8_to_uvchr(s, 0) : (*s & 0xff));
+    XPUSHu(DO_UTF8(argsv) ?
+	   utf8n_to_uvchr(s, UTF8_MAXLEN, 0, UTF8_ALLOW_ANYUV) :
+	   (*s & 0xff));
 
     RETURN;
 }
@@ -3686,7 +3688,8 @@ PP(pp_each)
 
     EXTEND(SP, 2);
     if (entry) {
-	PUSHs(hv_iterkeysv(entry));	/* won't clobber stack_sp */
+        SV* sv = hv_iterkeysv(entry);
+	PUSHs(sv);	/* won't clobber stack_sp */
 	if (gimme == G_ARRAY) {
 	    SV *val;
 	    PUTBACK;