12223 Update libdwarf to libdwarf-20200612

Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@joyent.com>

1 files changed, 120 insertions, 333 deletions

diff --git a/usr/src/lib/libdwarf/common/dwarf_error.c b/usr/src/lib/libdwarf/common/dwarf_error.c
index 7327529820..b349b2322d 100644
--- a/usr/src/lib/libdwarf/common/dwarf_error.c
+++ b/usr/src/lib/libdwarf/common/dwarf_error.c
@@ -1,366 +1,144 @@
 /*
 
   Copyright (C) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
-  Portions Copyright (C) 2008-2010 David Anderson.  All Rights Reserved.
+  Portions Copyright (C) 2008-2014 David Anderson.  All Rights Reserved.
 
   This program is free software; you can redistribute it and/or modify it
-  under the terms of version 2.1 of the GNU Lesser General Public License 
+  under the terms of version 2.1 of the GNU Lesser General Public License
   as published by the Free Software Foundation.
 
   This program is distributed in the hope that it would be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
   Further, this software is distributed without any warranty that it is
-  free of the rightful claim of any third person regarding infringement 
-  or the like.  Any license provided herein, whether implied or 
+  free of the rightful claim of any third person regarding infringement
+  or the like.  Any license provided herein, whether implied or
   otherwise, applies only to this software file.  Patent licenses, if
-  any, provided herein do not apply to combinations of this program with 
-  other software, or any other product whatsoever.  
+  any, provided herein do not apply to combinations of this program with
+  other software, or any other product whatsoever.
 
-  You should have received a copy of the GNU Lesser General Public 
-  License along with this program; if not, write the Free Software 
+  You should have received a copy of the GNU Lesser General Public
+  License along with this program; if not, write the Free Software
   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston MA 02110-1301,
   USA.
 
-  Contact information:  Silicon Graphics, Inc., 1500 Crittenden Lane,
-  Mountain View, CA 94043, or:
-
-  http://www.sgi.com
-
-  For further information regarding this notice, see:
-
-  http://oss.sgi.com/projects/GenInfo/NoticeExplan
-
 */
 
-
-
 #include "config.h"
-#include "dwarf_incl.h"
-#ifdef HAVE_ELF_H
-#include <elf.h>
-#endif
-
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif /* HAVE_STDLIB_H */
+#include "dwarf_incl.h"
+#include "dwarf_alloc.h"
+#include "dwarfstring.h"
+#include "dwarf_error.h"
 
-/* Array to hold string representation of errors. Any time a 
-   define is added to the list in libdwarf.h, a string should be 
+/* Array to hold string representation of errors. Any time a
+   define is added to the list in libdwarf.h, a string should be
    added to this Array
 */
+#include "dwarf_errmsg_list.h"
 
-const char *_dwarf_errmsgs[] = {
-
-    "No error (0)\n",
-    "DW_DLE_VMM 1 dwarf format/library version mismatch",
-    "DW_DLE_MAP 2 memory map failure",
-    "DW_DLE_LEE 3 libelf error",
-    "DW_DLE_NDS 4 no debug section",
-    "DW_DLE_NLS    5  no line section ",
-    "DW_DLE_ID     6  invalid descriptor for query ",
-    "DW_DLE_IOF    7  I/O failure ",
-    "DW_DLE_MAF    8  memory allocation failure ",
-    "DW_DLE_IA     9  invalid argument ",
-    "DW_DLE_MDE    10  mangled debugging entry ",
-    "DW_DLE_MLE    11  mangled line number entry ",
-    "DW_DLE_FNO    12  file not open ",
-    "DW_DLE_FNR    13  file not a regular file ",
-    "DW_DLE_FWA    14  file open with wrong access ",
-    "DW_DLE_NOB    15  not an object file ",
-    "DW_DLE_MOF    16  mangled object file header ",
-    "DW_DLE_EOLL   17  end of location list entries ",
-    "DW_DLE_NOLL   18  no location list section ",
-    "DW_DLE_BADOFF 19  Invalid offset ",
-    "DW_DLE_EOS    20  end of section  ",
-    "DW_DLE_ATRUNC 21  abbreviations section appears truncated",
-    "DW_DLE_BADBITC  22  Address size passed to dwarf bad",
-
-    "DW_DLE_DBG_ALLOC 23 Unable to malloc a Dwarf_Debug structure",
-    "DW_DLE_FSTAT_ERROR 24 The file fd passed to dwarf_init "
-        "cannot be fstat()ed",
-    "DW_DLE_FSTAT_MODE_ERROR 25 The file mode bits do not "
-        "indicate that the file being opened via "
-        "dwarf_init() is a normal file",
-    "DW_DLE_INIT_ACCESS_WRONG 26 A call to dwarf_init had an "
-        "access of other than DW_DLC_READ",
-    "DW_DLE_ELF_BEGIN_ERROR 27 a call to "
-        "elf_begin(... ELF_C_READ_MMAP... ) failed",
-    "DW_DLE_ELF_GETEHDR_ERROR 28 a call to "
-        "elf32_getehdr() or elf64_getehdr() failed",
-    "DW_DLE_ELF_GETSHDR_ERROR 29 a call to "
-        "elf32_getshdr() or elf64_getshdr() failed",
-    "DW_DLE_ELF_STRPTR_ERROR 30 a call to "
-        "elf_strptr() failed trying to get a section name",
-    "DW_DLE_DEBUG_INFO_DUPLICATE 31  Only one .debug_info  "
-        "section is allowed",
-    "DW_DLE_DEBUG_INFO_NULL 32 .debug_info section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_ABBREV_DUPLICATE 33 Only one .debug_abbrev  "
-        "section is allowed",
-    "DW_DLE_DEBUG_ABBREV_NULL 34 .debug_abbrev section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_ARANGES_DUPLICATE 35 Only one .debug_aranges  "
-        "section is allowed",
-    "DW_DLE_DEBUG_ARANGES_NULL 36 .debug_aranges section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_LINE_DUPLICATE 37 Only one .debug_line  "
-        "section is allowed",
-    "DW_DLE_DEBUG_LINE_NULL (38) .debug_line section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_LOC_DUPLICATE (39) Only one .debug_loc  "
-        "section is allowed",
-    "DW_DLE_DEBUG_LOC_NULL (40) .debug_loc section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_MACINFO_DUPLICATE (41) Only one .debug_macinfo  "
-        "section is allowed",
-    "DW_DLE_DEBUG_MACINFO_NULL (42) .debug_macinfo section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_PUBNAMES_DUPLICATE (43) Only one .debug_pubnames  "
-        "section is allowed",
-    "DW_DLE_DEBUG_PUBNAMES_NULL (44) .debug_pubnames section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_STR_DUPLICATE (45)  Only one .debug_str  "
-        "section is allowed",
-    "DW_DLE_DEBUG_STR_NULL (46) .debug_str section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_CU_LENGTH_ERROR (47)",
-    "DW_DLE_VERSION_STAMP_ERROR (48)",
-    "DW_DLE_ABBREV_OFFSET_ERROR (49)",
-    "DW_DLE_ADDRESS_SIZE_ERROR (50)",
-    "DW_DLE_DEBUG_INFO_PTR_NULL (51)",
-    "DW_DLE_DIE_NULL (52)",
-    "DW_DLE_STRING_OFFSET_BAD (53)",
-    "DW_DLE_DEBUG_LINE_LENGTH_BAD (54)",
-    "DW_DLE_LINE_PROLOG_LENGTH_BAD (55)",
-    "DW_DLE_LINE_NUM_OPERANDS_BAD",
-    "DW_DLE_LINE_SET_ADDR_ERROR",
-    "DW_DLE_LINE_EXT_OPCODE_BAD",
-    "DW_DLE_DWARF_LINE_NULL",
-    "DW_DLE_INCL_DIR_NUM_BAD",
-    "DW_DLE_LINE_FILE_NUM_BAD",
-    "DW_DLE_ALLOC_FAIL",
-    "DW_DLE_NO_CALLBACK_FUNC",
-    "DW_DLE_SECT_ALLOC",
-    "DW_DLE_FILE_ENTRY_ALLOC",
-    "DW_DLE_LINE_ALLOC",
-    "DW_DLE_FPGM_ALLOC",
-    "DW_DLE_INCDIR_ALLOC",
-    "DW_DLE_STRING_ALLOC",
-    "DW_DLE_CHUNK_ALLOC",
-    "DW_DLE_BYTEOFF_ERR",
-    "DW_DLE_CIE_ALLOC",
-    "DW_DLE_FDE_ALLOC",
-    "DW_DLE_REGNO_OVFL",
-    "DW_DLE_CIE_OFFS_ALLOC",
-    "DW_DLE_WRONG_ADDRESS",
-    "DW_DLE_EXTRA_NEIGHBORS",
-    "DW_DLE_WRONG_TAG",
-    "DW_DLE_DIE_ALLOC",
-    "DW_DLE_PARENT_EXISTS",
-    "DW_DLE_DBG_NULL",
-    "DW_DLE_DEBUGLINE_ERROR",
-    "DW_DLE_DEBUGFRAME_ERROR",
-    "DW_DLE_DEBUGINFO_ERROR",
-    "DW_DLE_ATTR_ALLOC",
-    "DW_DLE_ABBREV_ALLOC",
-    "DW_DLE_OFFSET_UFLW",
-    "DW_DLE_ELF_SECT_ERR",
-    "DW_DLE_DEBUG_FRAME_LENGTH_BAD",
-    "DW_DLE_FRAME_VERSION_BAD",
-    "DW_DLE_CIE_RET_ADDR_REG_ERROR",
-    "DW_DLE_FDE_NULL",
-    "DW_DLE_FDE_DBG_NULL",
-    "DW_DLE_CIE_NULL",
-    "DW_DLE_CIE_DBG_NULL",
-    "DW_DLE_FRAME_TABLE_COL_BAD",
-    "DW_DLE_PC_NOT_IN_FDE_RANGE",
-    "DW_DLE_CIE_INSTR_EXEC_ERROR",
-    "DW_DLE_FRAME_INSTR_EXEC_ERROR",
-    "DW_DLE_FDE_PTR_NULL",
-    "DW_DLE_RET_OP_LIST_NULL",
-    "DW_DLE_LINE_CONTEXT_NULL",
-    "DW_DLE_DBG_NO_CU_CONTEXT",
-    "DW_DLE_DIE_NO_CU_CONTEXT",
-    "DW_DLE_FIRST_DIE_NOT_CU",
-    "DW_DLE_NEXT_DIE_PTR_NULL",
-    "DW_DLE_DEBUG_FRAME_DUPLICATE  Only one .debug_frame  "
-        "section is allowed",
-    "DW_DLE_DEBUG_FRAME_NULL  .debug_frame section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_ABBREV_DECODE_ERROR",
-    "DW_DLE_DWARF_ABBREV_NULL",
-    "DW_DLE_ATTR_NULL",
-    "DW_DLE_DIE_BAD",
-    "DW_DLE_DIE_ABBREV_BAD",
-    "DW_DLE_ATTR_FORM_BAD",
-    "DW_DLE_ATTR_NO_CU_CONTEXT",
-    "DW_DLE_ATTR_FORM_SIZE_BAD",
-    "DW_DLE_ATTR_DBG_NULL",
-    "DW_DLE_BAD_REF_FORM",
-    "DW_DLE_ATTR_FORM_OFFSET_BAD",
-    "DW_DLE_LINE_OFFSET_BAD",
-    "DW_DLE_DEBUG_STR_OFFSET_BAD",
-    "DW_DLE_STRING_PTR_NULL",
-    "DW_DLE_PUBNAMES_VERSION_ERROR",
-    "DW_DLE_PUBNAMES_LENGTH_BAD",
-    "DW_DLE_GLOBAL_NULL",
-    "DW_DLE_GLOBAL_CONTEXT_NULL",
-    "DW_DLE_DIR_INDEX_BAD",
-    "DW_DLE_LOC_EXPR_BAD",
-    "DW_DLE_DIE_LOC_EXPR_BAD",
-    "DW_DLE_ADDR_ALLOC",
-    "DW_DLE_OFFSET_BAD",
-    "DW_DLE_MAKE_CU_CONTEXT_FAIL",
-    "DW_DLE_REL_ALLOC",
-    "DW_DLE_ARANGE_OFFSET_BAD",
-    "DW_DLE_SEGMENT_SIZE_BAD",
-    "DW_DLE_ARANGE_LENGTH_BAD",
-    "DW_DLE_ARANGE_DECODE_ERROR",
-    "DW_DLE_ARANGES_NULL",
-    "DW_DLE_ARANGE_NULL",
-    "DW_DLE_NO_FILE_NAME",
-    "DW_DLE_NO_COMP_DIR",
-    "DW_DLE_CU_ADDRESS_SIZE_BAD",
-    "DW_DLE_INPUT_ATTR_BAD",
-    "DW_DLE_EXPR_NULL",
-    "DW_DLE_BAD_EXPR_OPCODE",
-    "DW_DLE_EXPR_LENGTH_BAD",
-    "DW_DLE_MULTIPLE_RELOC_IN_EXPR",
-    "DW_DLE_ELF_GETIDENT_ERROR",
-    "DW_DLE_NO_AT_MIPS_FDE",
-    "DW_DLE_NO_CIE_FOR_FDE",
-    "DW_DLE_DIE_ABBREV_LIST_NULL",
-    "DW_DLE_DEBUG_FUNCNAMES_DUPLICATE",
-    "DW_DLE_DEBUG_FUNCNAMES_NULL .debug_funcnames section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_FUNCNAMES_VERSION_ERROR",
-    "DW_DLE_DEBUG_FUNCNAMES_LENGTH_BAD",
-    "DW_DLE_FUNC_NULL",
-    "DW_DLE_FUNC_CONTEXT_NULL",
-    "DW_DLE_DEBUG_TYPENAMES_DUPLICATE",
-    "DW_DLE_DEBUG_TYPENAMES_NULL .debug_typenames section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_TYPENAMES_VERSION_ERROR",
-    "DW_DLE_DEBUG_TYPENAMES_LENGTH_BAD",
-    "DW_DLE_TYPE_NULL",
-    "DW_DLE_TYPE_CONTEXT_NULL",
-    "DW_DLE_DEBUG_VARNAMES_DUPLICATE",
-    "DW_DLE_DEBUG_VARNAMES_NULL .debug_varnames section present but "
-        "elf_getdata() failed or section is zero-length",
-    "DW_DLE_DEBUG_VARNAMES_VERSION_ERROR",
-    "DW_DLE_DEBUG_VARNAMES_LENGTH_BAD",
-    "DW_DLE_VAR_NULL",
-    "DW_DLE_VAR_CONTEXT_NULL",
-    "DW_DLE_DEBUG_WEAKNAMES_DUPLICATE",
-    "DW_DLE_DEBUG_WEAKNAMES_NULL .debug_weaknames section present but "
-        "elf_getdata() failed or section is zero-length",
-
-    "DW_DLE_DEBUG_WEAKNAMES_VERSION_ERROR",
-    "DW_DLE_DEBUG_WEAKNAMES_LENGTH_BAD",
-    "DW_DLE_WEAK_NULL",
-    "DW_DLE_WEAK_CONTEXT_NULL (175)",
-    "DW_DLE_LOCDESC_COUNT_WRONG (176)",
-    "DW_DLE_MACINFO_STRING_NULL (177)",
-    "DW_DLE_MACINFO_STRING_EMPTY (178)",
-    "DW_DLE_MACINFO_INTERNAL_ERROR_SPACE (179)",
-    "DW_DLE_MACINFO_MALLOC_FAIL (180)",
-    "DW_DLE_DEBUGMACINFO_ERROR (181)",
-    "DW_DLE_DEBUG_MACRO_LENGTH_BAD (182)",
-    "DW_DLE_DEBUG_MACRO_MAX_BAD (183)",
-    "DW_DLE_DEBUG_MACRO_INTERNAL_ERR (184)",
-    "DW_DLE_DEBUG_MACRO_MALLOC_SPACE (185)",
-    "DW_DLE_DEBUG_MACRO_INCONSISTENT (186)",
-    "DW_DLE_DF_NO_CIE_AUGMENTATION(187)",
-    "DW_DLE_DF_REG_NUM_TOO_HIGH(188)",
-    "DW_DLE_DF_MAKE_INSTR_NO_INIT(189)",
-    "DW_DLE_DF_NEW_LOC_LESS_OLD_LOC(190)",
-    "DW_DLE_DF_POP_EMPTY_STACK(191)",
-    "DW_DLE_DF_ALLOC_FAIL(192)",
-    "DW_DLE_DF_FRAME_DECODING_ERROR(193)",
-    "DW_DLE_DEBUG_LOC_SECTION_SHORT(194)",
-    "DW_DLE_FRAME_AUGMENTATION_UNKNOWN(195)",
-    "DW_DLE_PUBTYPE_CONTEXT(196)",
-    "DW_DLE_DEBUG_PUBTYPES_LENGTH_BAD(197)",
-    "DW_DLE_DEBUG_PUBTYPES_VERSION_ERROR(198)",
-    "DW_DLE_DEBUG_PUBTYPES_DUPLICATE(199)",
-    "DW_DLE_FRAME_CIE_DECODE_ERROR(200)",
-    "DW_DLE_FRAME_REGISTER_UNREPRESENTABLE(201)",
-    "DW_DLE_FRAME_REGISTER_COUNT_MISMATCH(202)",
-    "DW_DLE_LINK_LOOP(203)",
-    "DW_DLE_STRP_OFFSET_BAD(204)",
-    "DW_DLE_DEBUG_RANGES_DUPLICATE(205)",
-    "DW_DLE_DEBUG_RANGES_OFFSET_BAD(206)",
-    "DW_DLE_DEBUG_RANGES_MISSING_END(207)",
-    "DW_DLE_DEBUG_RANGES_OUT_OF_MEM(208)",
-    "DW_DLE_DEBUG_SYMTAB_ERR(209)",
-    "DW_DLE_DEBUG_STRTAB_ERR(210)",
-    "DW_DLE_RELOC_MISMATCH_INDEX(211)",
-    "DW_DLE_RELOC_MISMATCH_RELOC_INDEX(212)",
-    "DW_DLE_RELOC_MISMATCH_STRTAB_INDEX(213)",
-    "DW_DLE_RELOC_SECTION_MISMATCH(214)",
-    "DW_DLE_RELOC_SECTION_MISSING_INDEX(215)",
-    "DW_DLE_RELOC_SECTION_LENGTH_ODD(216)",
-    "DW_DLE_RELOC_SECTION_PTR_NULL(217)",
-    "DW_DLE_RELOC_SECTION_MALLOC_FAIL(218)",
-    "DW_DLE_NO_ELF64_SUPPORT(219)",
-    "DW_DLE_MISSING_ELF64_SUPPORT(220)",
-    "DW_DLE_ORPHAN_FDE(221)",
-    "DW_DLE_DUPLICATE_INST_BLOCK(222)",
-    "DW_DLE_BAD_REF_SIG8_FORM(223)",
-    "DW_DLE_ATTR_EXPRLOC_FORM_BAD(224)",
-    "DW_DLE_FORM_SEC_OFFSET_LENGTH_BAD(225)",
-    "DW_DLE_NOT_REF_FORM(226)",
-    "DW_DLE_DEBUG_FRAME_LENGTH_NOT_MULTIPLE(227)"
-};
-
-
-
-
-/* 
-    This function performs error handling as described in the 
+/*  This function performs error handling as described in the
     libdwarf consumer document section 3.  Dbg is the Dwarf_debug
     structure being processed.  Error is a pointer to the pointer
     to the error descriptor that will be returned.  Errval is an
     error code listed in dwarf_error.h.
+
+    If the malloc arena is exhausted we return a pointer to
+    a special static error record.  This special singleton
+    is mostly ignored by dwarf_dealloc().
+    Users should not be storing Dwarf_Error pointers
+    for long so this singleton is only going to cause
+    confusion when callers try to save an out-of-memory
+    Dwarf_Error pointer.
+    The _dwarf_failsafe_error is intended to
+    be an improvement over an abort() call.
+    The failsafe means we will not abort due to
+    a Dwarf_Error struct creation.
 */
+
+/*  The user provides an explanatory string, the error
+    number itself explains little.
+    This prepends DW_DLE_USER_DECLARED_ERROR to the
+    caller-provided string.
+    New in April, 2020 .  Used by dwarfdump in a few
+    circumstances. */
 void
-_dwarf_error(Dwarf_Debug dbg, Dwarf_Error * error, Dwarf_Sword errval)
+dwarf_error_creation(Dwarf_Debug dbg,
+    Dwarf_Error *err,
+    char *errmsg)
 {
-    Dwarf_Error errptr;
+    dwarfstring m;
+    if(!dbg) {
+        return;
+    }
+    dwarfstring_constructor(&m);
+    dwarfstring_append(&m,"DW_DLE_USER_DECLARED_ERROR: ");
+    dwarfstring_append(&m,errmsg);
+    _dwarf_error_string(dbg,err,
+        DW_DLE_USER_DECLARED_ERROR,
+        dwarfstring_string(&m));
+    dwarfstring_destructor(&m);
+}
 
-    /* 
-       Allow NULL dbg on entry, since sometimes that can happen and we
-       want to report the upper-level error, not this one. */
-    if (error != NULL) {
 
-        /* 
-           If dbg is NULL, use the alternate error struct. However,
-           this will overwrite the earlier error. */
-        if (dbg != NULL) {
+void
+_dwarf_error(Dwarf_Debug dbg, Dwarf_Error * error,
+    Dwarf_Signed errval)
+{
+    _dwarf_error_string(dbg,error,errval,0);
+}
+void
+_dwarf_error_string(Dwarf_Debug dbg, Dwarf_Error * error,
+    Dwarf_Signed errval,char *msg)
+{
+    Dwarf_Error errptr;
+
+    /*  Allow NULL dbg on entry, since sometimes that can happen and we
+        want to report the upper-level error, not this one. */
+    if (error) {
+        /*  If dbg is NULL, use the alternate error struct. However,
+            this will overwrite the earlier error. */
+        if (dbg) {
             errptr =
                 (Dwarf_Error) _dwarf_get_alloc(dbg, DW_DLA_ERROR, 1);
-            if (errptr == NULL) {
-                fprintf(stderr,
-                        "Could not allocate Dwarf_Error structure, "
-                        "abort() in libdwarf.\n");
-                abort();
+            if (!errptr) {
+                errptr = &_dwarf_failsafe_error;
+                errptr->er_static_alloc = DE_STATIC;
+            } else {
+                errptr->er_static_alloc = DE_STANDARD;
             }
         } else {
-            /* We have no dbg to work with. dwarf_init failed. We hack
-               up a special area. */
+            /*  We have no dbg to work with. dwarf_init
+                failed. We hack
+                up a special area. */
             errptr = _dwarf_special_no_dbg_error_malloc();
-            if (errptr == NULL) {
-                fprintf(stderr,
-                        "Could not allocate Dwarf_Error structure, "
-                        "abort() in libdwarf..\n");
-                abort();
+            if (!errptr) {
+                errptr = &_dwarf_failsafe_error;
+                errptr->er_static_alloc = DE_STATIC;
+            } else {
+                errptr->er_static_alloc = DE_MALLOC;
             }
         }
-
         errptr->er_errval = errval;
+        if (msg) {
+            dwarfstring *em = 0;
+
+#ifdef DEBUG
+printf("libdwarfdetector ALLOC creating error string %s errval %ld errptr 0x%lx \n",msg,(long)errval,(unsigned long)errptr);
+#endif
+            em = (dwarfstring *)calloc(1,sizeof(dwarfstring));
+            if (em) {
+                dwarfstring_constructor(em);
+                dwarfstring_append(em,msg);
+                errptr->er_msg = (void*)em;
+            }
+        }
         *error = errptr;
         return;
     }
@@ -368,16 +146,18 @@ _dwarf_error(Dwarf_Debug dbg, Dwarf_Error * error, Dwarf_Sword errval)
     if (dbg != NULL && dbg->de_errhand != NULL) {
         errptr = (Dwarf_Error) _dwarf_get_alloc(dbg, DW_DLA_ERROR, 1);
         if (errptr == NULL) {
-            fprintf(stderr, "Could not allocate Dwarf_Error structure,"
-                    " abort() in libdwarf.\n");
-            abort();
+            errptr = &_dwarf_failsafe_error;
+            errptr->er_static_alloc = DE_STATIC;
         }
         errptr->er_errval = errval;
         dbg->de_errhand(errptr, dbg->de_errarg);
         return;
     }
-    fprintf(stderr,
-            "abort() in libdwarf. No error argument, no handler.\n");
+    fflush(stdout);
+    fprintf(stdout,
+        "\nNow abort() in libdwarf. "
+        "No error argument or handler available.\n");
+    fflush(stdout);
     abort();
 }
 
@@ -385,26 +165,33 @@ _dwarf_error(Dwarf_Debug dbg, Dwarf_Error * error, Dwarf_Sword errval)
 Dwarf_Unsigned
 dwarf_errno(Dwarf_Error error)
 {
-    if (error == NULL) {
+    if (!error) {
         return (0);
     }
-
     return (error->er_errval);
 }
 
+char*
+dwarf_errmsg_by_number(Dwarf_Unsigned errornum )
+{
+    if (errornum >=
+        (Dwarf_Signed)(sizeof(_dwarf_errmsgs) / sizeof(char *))) {
+        return "Dwarf_Error value out of range";
+    }
+    return ((char *) _dwarf_errmsgs[errornum]);
+}
 
-/* 
+
+/*
 */
 char *
 dwarf_errmsg(Dwarf_Error error)
 {
-    if (error == NULL) {
+    if (!error) {
         return "Dwarf_Error is NULL";
     }
-
-    if (error->er_errval > (sizeof(_dwarf_errmsgs) / sizeof(char *))) {
-        return "Dwarf_Error value out of range";
+    if (error->er_msg) {
+        return dwarfstring_string(error->er_msg);
     }
-
-    return ((char *) _dwarf_errmsgs[error->er_errval]);
+    return  dwarf_errmsg_by_number(error->er_errval);
 }