diff options
Diffstat (limited to 'libasm/asm_newsym.c')
| -rw-r--r-- | libasm/asm_newsym.c | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/libasm/asm_newsym.c b/libasm/asm_newsym.c index 6a6df2d8..e2727b15 100644 --- a/libasm/asm_newsym.c +++ b/libasm/asm_newsym.c @@ -1,16 +1,28 @@ /* Define new symbol for current position in given section. - Copyright (C) 2002 Red Hat, Inc. + Copyright (C) 2002, 2005 Red Hat, Inc. + This file is part of Red Hat elfutils. Written by Ulrich Drepper <drepper@redhat.com>, 2002. - This program is Open Source software; you can redistribute it and/or - modify it under the terms of the Open Software License version 1.0 as - published by the Open Source Initiative. + Red Hat elfutils is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by the + Free Software Foundation; version 2 of the License. - You should have received a copy of the Open Software License along - with this program; if not, you may obtain a copy of the Open Software - License version 1.0 from http://www.opensource.org/licenses/osl.php or - by writing the Open Source Initiative c/o Lawrence Rosen, Esq., - 3001 King Ranch Road, Ukiah, CA 95482. */ + Red Hat elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with Red Hat elfutils; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. + + Red Hat elfutils is an included package of the Open Invention Network. + An included package of the Open Invention Network is a package for which + Open Invention Network licensees cross-license their patents. No patent + license is granted, either expressly or impliedly, by designation as an + included package. Should you wish to participate in the Open Invention + Network licensing program, please visit www.openinventionnetwork.com + <http://www.openinventionnetwork.com>. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -54,9 +66,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 +85,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 +110,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; } |