Storable: use utf8_to_bytes_overwrite() if available

This is simpler and saves a malloc each time.

Note that this code could use plain utf8_to_bytes() on older perls, but
it is less convenient, so would require more code; I don't think the
performance gain is worth it.

Author: khwilliamson

dist/Storable/Storable.xs

@@ -2960,6 +2960,19 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv)
             keyval = SvPV(key, keylen_tmp);
             keylen = keylen_tmp;
             if (SvUTF8(key)) {
+
+#ifdef utf8_to_bytes_overwrite
+
+                /* If we are able to downgrade here; that means that we have a
+                 * key which only had chars 0-255, but was utf8 encoded.  */
+                if (utf8_to_bytes_overwrite( (U8**) &keyval, &keylen_tmp)) {
+                    keylen = keylen_tmp;
+                    flags |= SHV_K_WASUTF8;
+                }
+                else {
+                    flags |= SHV_K_UTF8;
+                }
+#else
                 const char *keysave = keyval;
                 bool is_utf8 = TRUE;
 
@@ -2982,6 +2995,7 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv)
                        to assign back to keylen.  */
                     flags |= SHV_K_UTF8;
                 }
+#endif
             }
 
             if (flagged_hash) {
@@ -3000,8 +3014,12 @@ static int store_hash(pTHX_ stcxt_t *cxt, HV *hv)
             WLEN(keylen);
             if (keylen)
                 WRITE(keyval, keylen);
+
+#ifndef utf8_to_bytes_overwrite
+
             if (flags & SHV_K_WASUTF8)
                 Safefree (keyval);
+#endif
         }
 
         /*
@@ -7431,13 +7449,26 @@ static SV *do_retrieve(
         if (SvUTF8(in)) {
             STRLEN length;
             const char *orig = SvPV(in, length);
-            char *asbytes;
             /* This is quite deliberate. I want the UTF8 routines
                to encounter the '\0' which perl adds at the end
                of all scalars, so that any new string also has
                this.
             */
             STRLEN klen_tmp = length + 1;
+
+#  define CROAK_TO_BYTES_TEXT                                               \
+                "Frozen string corrupt - contains characters outside 0-255"
+#  ifdef utf8_to_bytes_overwrite
+
+            if (! utf8_to_bytes_overwrite( (U8**) &orig, &klen_tmp)) {
+                CROAK((CROAK_TO_BYTES_TEXT));
+            }
+
+            SvLEN_set(in, klen_tmp);
+            SvCUR_set(in, klen_tmp - 1);
+
+#  else
+            char *asbytes;
             bool is_utf8 = TRUE;
 
             /* Just casting the &klen to (STRLEN) won't work
@@ -7447,7 +7478,7 @@ static SV *do_retrieve(
                                              &klen_tmp,
                                              &is_utf8);
             if (is_utf8) {
-                CROAK(("Frozen string corrupt - contains characters outside 0-255"));
+                CROAK((CROAK_TO_BYTES_TEXT));
             }
             if (asbytes != orig) {
                 /* String has been converted.
@@ -7462,6 +7493,8 @@ static SV *do_retrieve(
                 SvLEN_set(in, klen_tmp);
                 SvCUR_set(in, klen_tmp - 1);
             }
+#  endif
+
         }
 #endif
         MBUF_SAVE_AND_LOAD(in);

dist/Storable/lib/Storable.pm

@@ -30,7 +30,7 @@ our @EXPORT_OK = qw(
 our ($canonical, $forgive_me);
 
 BEGIN {
-    our $VERSION = '3.35';
+    our $VERSION = '3.36';
 }
 
 our $recursion_limit;