diff options
Diffstat (limited to 'elfutils/libasm/asm_newsym.c')
| -rw-r--r-- | elfutils/libasm/asm_newsym.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/elfutils/libasm/asm_newsym.c b/elfutils/libasm/asm_newsym.c index 6a6df2d8..70ad9e5d 100644 --- a/elfutils/libasm/asm_newsym.c +++ b/elfutils/libasm/asm_newsym.c @@ -1,5 +1,5 @@ /* Define new symbol for current position in given section. - Copyright (C) 2002 Red Hat, Inc. + Copyright (C) 2002, 2005 Red Hat, Inc. Written by Ulrich Drepper <drepper@redhat.com>, 2002. This program is Open Source software; you can redistribute it and/or @@ -54,9 +54,13 @@ asm_newsym (asmscn, name, size, type, binding) // XXX This requires getting the format from the machine backend. */ snprintf (tempsym, TEMPSYMLEN, ".L%07u", asmscn->ctx->tempsym_count++); + + name = tempsym; } - result = (AsmSym_t *) malloc (sizeof (AsmSym_t)); + size_t name_len = strlen (name) + 1; + + result = (AsmSym_t *) malloc (sizeof (AsmSym_t) + name_len); if (result == NULL) return NULL; @@ -69,15 +73,12 @@ asm_newsym (asmscn, name, size, type, binding) result->binding = binding; result->symidx = 0; result->strent = ebl_strtabadd (asmscn->ctx->symbol_strtab, - name ?: tempsym, 0); + memcpy (result + 1, name, name_len), 0); if (unlikely (asmscn->ctx->textp)) { /* We are only interested in the name and don't need to know whether it is a local name or not. */ - if (name == NULL) - name = tempsym; - /* First print the binding pseudo-op. */ if (binding == STB_GLOBAL) fprintf (asmscn->ctx->out.file, "\t.globl\t%s\n", name); @@ -97,15 +98,21 @@ asm_newsym (asmscn, name, size, type, binding) else { /* Put the symbol in the hash table so that we can later find it. */ - if (asm_symbol_tab_insert (&asmscn->ctx->symbol_tab, - elf_hash (name ?: tempsym), result) != 0) + if (asm_symbol_tab_insert (&asmscn->ctx->symbol_tab, elf_hash (name), + result) != 0) { /* The symbol already exists. */ __libasm_seterrno (ASM_E_DUPLSYM); + /* Note that we can free the entry since there must be no + reference in the string table to the string. We can only + fail to insert the symbol into the symbol table if there + is already a symbol with this name. In this case the + ebl_strtabadd function would use the previously provided + name. */ free (result); result = NULL; } - else if (name != NULL && asm_emit_symbol_p (name)) + else if (name != tempsym && asm_emit_symbol_p (name)) /* Only count non-private symbols. */ ++asmscn->ctx->nsymbol_tab; } |