mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

quote: we must do unsigned comparison to get length of octal escape

Browse Source 
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>
This commit is contained in:
H. Peter Anvin 2009-07-15 16:22:47 -04:00
parent b93c1881f6
commit 4d5029dd76
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
quote.c
View File

@ -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;