l

Author: khwilliamson

locale.c

@@ -9653,7 +9653,7 @@ Perl_mem_collxfrm_(pTHX_ const char *input_string,
         if (PL_collxfrm_base != 0) { /* bad collation => skip */
             DEBUG_L(PerlIO_printf(Perl_debug_log,
                           "mem_collxfrm_: locale's collation is defective\n"));
-            goto bad;
+            goto bad_not_toggled;
         }
 
         /* (mult, base) == (0,0) means we need to calculate mult and base
@@ -9779,7 +9779,7 @@ Perl_mem_collxfrm_(pTHX_ const char *input_string,
                 DEBUG_L(PerlIO_printf(Perl_debug_log,
                     "mem_collxfrm_: Couldn't find any character to replace"
                     " embedded NULs in locale %s with", PL_collation_name));
-                goto bad;
+                goto bad_not_toggled;
             }
 
             DEBUG_L(PerlIO_printf(Perl_debug_log,
@@ -9920,7 +9920,7 @@ Perl_mem_collxfrm_(pTHX_ const char *input_string,
                         "mem_collxfrm_: Couldn't find any character to"
                         " replace above-Latin1 chars in locale %s with",
                         PL_collation_name));
-                    goto bad;
+                    goto bad_not_toggled;
                 }
 
                 DEBUG_L(PerlIO_printf(Perl_debug_log,
@@ -10080,7 +10080,7 @@ Perl_mem_collxfrm_(pTHX_ const char *input_string,
     if (UNLIKELY(! xbuf)) {
         DEBUG_L(PerlIO_printf(Perl_debug_log,
                       "mem_collxfrm_: Couldn't malloc %zu bytes\n", xAlloc));
-        goto bad;
+        goto bad_not_toggled;
     }
 
     /* Store the collation id */
@@ -10276,6 +10276,10 @@ Perl_mem_collxfrm_(pTHX_ const char *input_string,
     DEBUG_L(print_collxfrm_input_and_return(s, s + len, NULL, 0, utf8));
     CLEANUP_STRXFRM;
 
+  bad_not_toggled:
+
+    DEBUG_L(print_collxfrm_input_and_return(s, s + len, NULL, 0, utf8));
+
     Safefree(xbuf);
     *xlen = 0;