[perl #55114] [PATCH] [CAGE] Clean find_exception_handler

[via RT]

# New Ticket Created by  NotFound 
# Please include the string:  [perl #55114]
# in the subject line of all future correspondence about this issue. 
# <URL: http://rt.perl.org/rt3/Ticket/Display.html?id=55114 >


This patch does some cleaning in the find_exception_handler function,
making more coherent PIO usage in output.

-- 
Salu2

Index: src/exceptions.c
===================================================================
--- src/exceptions.c	(revisión: 27949)
+++ src/exceptions.c	(copia de trabajo)
@@ -284,7 +284,6 @@
 static PMC *
 find_exception_handler(PARROT_INTERP, ARGIN(PMC *exception))
 {
-    char *m;
     int exit_status, print_location;
     int depth = 0;
     Stack_Entry_t *e;
@@ -292,7 +291,6 @@
     /* for now, we don't check the exception class and we don't
      * look for matching handlers.  [this is being redesigned anyway.]
      */
-    STRING * const message = VTABLE_get_string_keyed_int(interp, exception, 0);
 
     /* [RT#45909: replace quadratic search with something linear, hopefully
      * without trashing abstraction layers.  -- rgr, 17-Sep-06.] */
@@ -315,29 +313,28 @@
         PIO_flush(interp->debugger, PIO_STDERR(interp->debugger));
     }
 
-    m = string_to_cstring(interp, message);
-    exit_status = print_location = 1;
-    if (m && *m) {
-        fputs(m, stderr);
-        if (m[strlen(m)-1] != '\n')
-            fprintf(stderr, "%c", '\n');
-        string_cstring_free(m);
-    }
-    else {
-        if (m)
-            string_cstring_free(m); /* coverity fix, m was allocated but was "\0" */
-        /* new block for const assignment */
-        {
-            const INTVAL severity = VTABLE_get_integer_keyed_int(interp, exception, 2);
+    { /* Scope for message */
+        STRING * const message =
+            VTABLE_get_string_keyed_int(interp, exception, 0);
+        if (message && string_length(interp, message) > 0) {
+            exit_status = print_location = 1;
+            PIO_eprintf(interp, "%Ss", message);
+            if (string_ord(interp, message, -1) != '\n')
+                PIO_eprintf(interp, "%c", '\n');
+        }
+        else {
+            const INTVAL severity =
+                VTABLE_get_integer_keyed_int(interp, exception, 2);
             if (severity == EXCEPT_exit) {
                 print_location = 0;
                 exit_status =
                     (int)VTABLE_get_integer_keyed_int(interp, exception, 1);
             }
             else
-                fprintf(stderr, "No exception handler and no message\n");
+                PIO_eprintf(interp, "No exception handler and no message\n");
         }
     }
+    PIO_flush(interp, PIO_STDERR(interp));
     /* caution against output swap (with PDB_backtrace) */
     fflush(stderr);
     if (print_location)