aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00
Code

asm/directiv.c: fix bug in perm_alloc()

Browse Source 
Fix dumb thinko in perm_alloc().

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2018-06-01 21:05:45 -07:00
parent 69f0551f6f
commit 3cb9068ee0
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asm/directiv.c
View File

@ -332,13 +332,14 @@ bool process_directives(char *directive)
} }
if (nasm_isspace(*q)) { if (nasm_isspace(*q)) {
sizestr = q = nasm_zap_spaces_fwd(q); *q++ = '\0';
sizestr = q = nasm_skip_spaces(q);
q = strchr(q, ':'); q = strchr(q, ':');
} else { } else {
sizestr = NULL; sizestr = NULL;
} }
if (*q == ':') { if (q && *q == ':') {
*q++ = '\0'; *q++ = '\0';
special = q; special = q;
} else { } else {

13
asm/labels.c
View File

@ -345,6 +345,12 @@ handle_herelabel(const union label *lptr, int32_t *segment, int64_t *offset)
static bool declare_label_lptr(union label *lptr, static bool declare_label_lptr(union label *lptr,
enum label_type type, const char *special) enum label_type type, const char *special)
{ {
if (special && !special[0])
special = NULL;
printf("declare_label %s type %d special %s\n",
lptr->defn.label, lptr->defn.type, lptr->defn.special);
if (lptr->defn.type == type || if (lptr->defn.type == type ||
(pass0 == 0 && lptr->defn.type == LBL_LOCAL)) { (pass0 == 0 && lptr->defn.type == LBL_LOCAL)) {
lptr->defn.type = type; lptr->defn.type = type;
@ -514,6 +520,8 @@ static void init_block(union label *blk)
static char * safe_alloc perm_alloc(size_t len) static char * safe_alloc perm_alloc(size_t len)
{ {
char *p;
if (perm_tail->size - perm_tail->usage < len) { if (perm_tail->size - perm_tail->usage < len) {
size_t alloc_len = (len > PERMTS_SIZE) ? len : PERMTS_SIZE; size_t alloc_len = (len > PERMTS_SIZE) ? len : PERMTS_SIZE;
perm_tail->next = nasm_malloc(PERMTS_HEADER + alloc_len); perm_tail->next = nasm_malloc(PERMTS_HEADER + alloc_len);
@ -522,8 +530,9 @@ static char * safe_alloc perm_alloc(size_t len)
perm_tail->size = alloc_len; perm_tail->size = alloc_len;
perm_tail->usage = 0; perm_tail->usage = 0;
} }
p = perm_tail->data + perm_tail->usage;
perm_tail->usage += len; perm_tail->usage += len;
return perm_tail->data + perm_tail->usage; return p;
} }
static char *perm_copy(const char *string) static char *perm_copy(const char *string)
@ -542,7 +551,7 @@ static char *perm_copy(const char *string)
return p; return p;
} }
static char * safe_alloc static char *
perm_copy3(const char *s1, const char *s2, const char *s3) perm_copy3(const char *s1, const char *s2, const char *s3)
{ {
char *p; char *p;