Address Robert's feedback

          --- old/usr/src/cmd/dis/dis_util.c
          +++ new/usr/src/cmd/dis/dis_util.c

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   *
  26   26   * Copyright 2017 Jason King.
  27   27   */
  28   28  
  29   29  #include <dlfcn.h>
  30   30  #include <stdarg.h>
  31   31  #include <stdio.h>
  32   32  #include <stdlib.h>
  33   33  #include <demangle.h>
  34   34  #include <sysdemangle.h>
  35   35  
  36   36  #include "dis_util.h"
  37   37  
  38   38  int g_error;    /* global process exit status, set when warn() is called */
  39   39  
  40   40  /*
  41   41   * Fatal error.  Print out the error with a leading "dis: ", and then exit the
  42   42   * program.
  43   43   */
  44   44  void
  45   45  die(const char *fmt, ...)
  46   46  {
  47   47          va_list ap;
  48   48  
  49   49          (void) fprintf(stderr, "dis: fatal: ");
  50   50  
  51   51          va_start(ap, fmt);
  52   52          (void) vfprintf(stderr, fmt, ap);
  53   53          va_end(ap);
  54   54  
  55   55          (void) fprintf(stderr, "\n");
  56   56  
  57   57          exit(1);
  58   58  }
  59   59  
  60   60  /*
  61   61   * Non-fatal error.  Print out the error with a leading "dis: ", set the global
  62   62   * error flag, and return.
  63   63   */
  64   64  void
  65   65  warn(const char *fmt, ...)
  66   66  {
  67   67          va_list ap;
  68   68  
  69   69          (void) fprintf(stderr, "dis: warning: ");
  70   70  
  71   71          va_start(ap, fmt);
  72   72          (void) vfprintf(stderr, fmt, ap);
  73   73          va_end(ap);
  74   74  
  75   75          (void) fprintf(stderr, "\n");
  76   76  
  77   77          g_error = 1;
  78   78  }
  79   79  
  80   80  /*
  81   81   * Convenience wrapper around malloc() to cleanly exit if any allocation fails.
  82   82   */
  83   83  void *
  84   84  safe_malloc(size_t size)
  85   85  {
  86   86          void *ret;
  87   87  
  88   88          if ((ret = calloc(1, size)) == NULL)
  89   89                  die("Out of memory");
  90   90  
  91   91          return (ret);
  92   92  }
  93   93  

  94   94  
  95   95  /*
  96   96   * Since -C flag explicitly says C++, for now at least, force language to
  97   97   * C++
  98   98   */
  99   99  const char *
 100  100  dis_demangle(const char *name)
 101  101  {
 102  102          static char *demangled_name = NULL;
 103  103  
      104 +        /*
      105 +         * Since demangled_name is static, it may be preserved across
      106 +         * invocations.  As such, make sure any memory that might be present
      107 +         * from previous invocations is freed.
      108 +         */
 104  109          free(demangled_name);
 105  110          demangled_name = sysdemangle(name, SYSDEM_LANG_CPP, NULL);
 106  111          return ((demangled_name != NULL) ? demangled_name : name);
 107  112  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX