diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-07-15 16:22:47 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-15 16:30:22 -0400 |
| commit | 4d5029dd76423277ccf4fb2cdf7200968aef3a8b (patch) | |
| tree | c2654590ab00b18a913f0ef93e9eb97daaccb542 | |
| parent | b93c1881f60c349755b4a369074360a4da497cd0 (diff) | |
| download | nasm-4d5029dd76423277ccf4fb2cdf7200968aef3a8b.tar.gz | |
quote: we must do unsigned comparison to get length of octal escape
When computing the length of an octal escape, we need to do an
unsigned compare, otherwise we only allocate space for one character
for bytes in the \200..\377 range, which is obviously incorrect.
Reported-by: Ed Beroset <beroset@mindspring.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | quote.c | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -48,6 +48,7 @@ char *nasm_quote(char *str, size_t len) { char c, c1, *p, *q, *nstr, *ep; + unsigned char uc; bool sq_ok, dq_ok; size_t qlen; @@ -86,12 +87,12 @@ char *nasm_quote(char *str, size_t len) default: c1 = (p+1 < ep) ? p[1] : 0; if (c1 >= '0' && c1 <= '7') - c1 = 0377; /* Must use the full form */ + uc = 0377; /* Must use the full form */ else - c1 = c; - if (c1 > 077) + uc = c; + if (uc > 077) qlen++; - if (c1 > 07) + if (uc > 07) qlen++; qlen += 2; break; @@ -158,15 +159,15 @@ char *nasm_quote(char *str, size_t len) if (c < ' ' || c > '~') { c1 = (p+1 < ep) ? p[1] : 0; if (c1 >= '0' && c1 <= '7') - c1 = 0377; /* Must use the full form */ + uc = 0377; /* Must use the full form */ else - c1 = c; + uc = c; *q++ = '\\'; - if (c1 > 077) - *q++ = (c >> 6) + '0'; - if (c1 > 07) - *q++ = ((c >> 3) & 7) + '0'; - *q++ = (c & 7) + '0'; + if (uc > 077) + *q++ = ((unsigned char)c >> 6) + '0'; + if (uc > 07) + *q++ = (((unsigned char)c >> 3) & 7) + '0'; + *q++ = ((unsigned char)c & 7) + '0'; break; } else { *q++ = c; |