gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix interpolation/STRFMT overflow issues"

Browse Source 
This reverts commit 992be3fd9b.
This commit is contained in:
Rangi
2021-04-16 22:19:37 -04:00
parent 992be3fd9b
commit 503c3b5364
9 changed files with 14 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm/format.h
View File

@@ -28,9 +28,9 @@ struct FormatSpec {
bool prefix; bool prefix;
bool alignLeft; bool alignLeft;
bool padZero; bool padZero;
size_t width; uint8_t width;
bool hasFrac; bool hasFrac;
size_t fracWidth; uint8_t fracWidth;
int type; int type;
bool valid; bool valid;
}; };

38
src/asm/format.c
View File

@@ -147,25 +147,21 @@ void fmt_PrintString(char *buf, size_t bufLen, struct FormatSpec const *fmt, cha
size_t len = strlen(value); size_t len = strlen(value);
size_t totalLen = fmt->width > len ? fmt->width : len; size_t totalLen = fmt->width > len ? fmt->width : len;
if (totalLen + 1 > bufLen) /* bufLen includes terminator */
error("Formatted string value too long\n");
size_t padLen = fmt->width > len ? fmt->width - len : 0; size_t padLen = fmt->width > len ? fmt->width - len : 0;
if (totalLen + 1 > bufLen) { /* bufLen includes terminator */
error("Formatted string value too long\n");
totalLen = bufLen - 1;
if (len > totalLen)
len = totalLen;
padLen = totalLen - len;
}
if (fmt->alignLeft) { if (fmt->alignLeft) {
memcpy(buf, value, len < bufLen ? len : bufLen); strncpy(buf, value, len < bufLen ? len : bufLen);
for (size_t i = 0; i < totalLen && len + i < bufLen; i++) for (size_t i = 0; i < totalLen && len + i < bufLen; i++)
buf[len + i] = ' '; buf[len + i] = ' ';
} else { } else {
for (size_t i = 0; i < padLen && i < bufLen; i++) for (size_t i = 0; i < padLen && i < bufLen; i++)
buf[i] = ' '; buf[i] = ' ';
if (bufLen > padLen) if (bufLen > padLen)
memcpy(buf + padLen, value, bufLen - padLen - 1); strncpy(buf + padLen, value, bufLen - padLen - 1);
} }
buf[totalLen] = '\0'; buf[totalLen] = '\0';
@@ -225,18 +221,12 @@ void fmt_PrintNumber(char *buf, size_t bufLen, struct FormatSpec const *fmt, uin
/* Special case for fixed-point */ /* Special case for fixed-point */
/* Default fractional width (C's is 6 for "%f"; here 5 is enough) */ /* Default fractional width (C's is 6 for "%f"; here 5 is enough) */
size_t fracWidth = fmt->hasFrac ? fmt->fracWidth : 5; uint8_t fracWidth = fmt->hasFrac ? fmt->fracWidth : 5;
if (fracWidth) { if (fracWidth) {
if (fracWidth > 255) {
error("Fractional width %zu too long, limiting to 255\n",
fracWidth);
fracWidth = 255;
}
char spec[16]; /* Max "%" + 5-char PRIu32 + ".%0255.f" + terminator */ char spec[16]; /* Max "%" + 5-char PRIu32 + ".%0255.f" + terminator */
snprintf(spec, sizeof(spec), "%%" PRIu32 ".%%0%zu.f", fracWidth); snprintf(spec, sizeof(spec), "%%" PRIu32 ".%%0%d.f", fracWidth);
snprintf(valueBuf, sizeof(valueBuf), spec, value >> 16, snprintf(valueBuf, sizeof(valueBuf), spec, value >> 16,
(value % 65536) / 65536.0 * pow(10, fracWidth) + 0.5); (value % 65536) / 65536.0 * pow(10, fracWidth) + 0.5);
} else { } else {
@@ -262,17 +252,11 @@ void fmt_PrintNumber(char *buf, size_t bufLen, struct FormatSpec const *fmt, uin
numLen++; numLen++;
size_t totalLen = fmt->width > numLen ? fmt->width : numLen; size_t totalLen = fmt->width > numLen ? fmt->width : numLen;
size_t padLen = fmt->width > numLen ? fmt->width - numLen : 0;
if (totalLen + 1 > bufLen) { /* bufLen includes terminator */ if (totalLen + 1 > bufLen) /* bufLen includes terminator */
error("Formatted numeric value too long\n"); error("Formatted numeric value too long\n");
totalLen = bufLen - 1;
if (numLen > totalLen) { size_t padLen = fmt->width > numLen ? fmt->width - numLen : 0;
len = totalLen - (numLen - len);
numLen = totalLen;
}
padLen = totalLen - numLen;
}
if (fmt->alignLeft) { if (fmt->alignLeft) {
size_t pos = 0; size_t pos = 0;

2
src/asm/rgbasm.5
View File

@@ -337,7 +337,7 @@ followed by one or more
\[en] \[en]
.Ql 9 . .Ql 9 .
If specified, prints this many digits of a fixed-point fraction. If specified, prints this many digits of a fixed-point fraction.
Defaults to 5 digits, maximum 255 digits. Defaults to 5 digits.
.It Ql <type> Ta Specifies the type of value. .It Ql <type> Ta Specifies the type of value.
.El .El
.Pp .Pp

15
test/asm/format-truncation.asm
View File

@@ -1,15 +0,0 @@
num equ 42
fix equ 123.456
str equs "hello"
println "{#0260x:num}"
println "{#-260x:num}"
println "{0280.260f:fix}"
println "{260s:str}"
println "{-260s:str}"
println "<{#0260x:num}>"
println "<{#-260x:num}>"
println "<{0280.260f:fix}>"
println "<{260s:str}>"
println "<{-260s:str}>"

35
test/asm/format-truncation.err
View File

@@ -1,35 +0,0 @@
ERROR: format-truncation.asm(5):
Formatted numeric value too long
ERROR: format-truncation.asm(6):
Formatted numeric value too long
ERROR: format-truncation.asm(7):
Fractional width 260 too long, limiting to 255
ERROR: format-truncation.asm(7):
Formatted numeric value too long
ERROR: format-truncation.asm(8):
Formatted string value too long
ERROR: format-truncation.asm(9):
Formatted string value too long
ERROR: format-truncation.asm(11):
Formatted numeric value too long
warning: format-truncation.asm(11): [-Wlong-string]
String constant too long
ERROR: format-truncation.asm(12):
Formatted numeric value too long
warning: format-truncation.asm(12): [-Wlong-string]
String constant too long
ERROR: format-truncation.asm(13):
Fractional width 260 too long, limiting to 255
ERROR: format-truncation.asm(13):
Formatted numeric value too long
warning: format-truncation.asm(13): [-Wlong-string]
String constant too long
ERROR: format-truncation.asm(14):
Formatted string value too long
warning: format-truncation.asm(14): [-Wlong-string]
String constant too long
ERROR: format-truncation.asm(15):
Formatted string value too long
warning: format-truncation.asm(15): [-Wlong-string]
String constant too long
error: Assembly aborted (12 errors)!

10
test/asm/format-truncation.out
View File

@@ -1,10 +0,0 @@
$0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a
$2a
123.45599365234375001369732334415661667551799560000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
hello
hello
<$0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002
<$2a
<123.4559936523437500136973233441566166755179956000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
< hell
<hello

4
test/asm/interpolation-overflow.asm
View File

@@ -1,4 +0,0 @@
; It seems that \1 was the easiest way to notice the memory corruption that
; resulted from this overflow
x = 0
{.99999999f:x}\1

9
test/asm/interpolation-overflow.err
View File

@@ -1,9 +0,0 @@
ERROR: interpolation-overflow.asm(4):
Fractional width 99999999 too long, limiting to 255
ERROR: interpolation-overflow.asm(4):
Formatted numeric value too long
warning: interpolation-overflow.asm(4): [-Wlarge-constant]
Precision of fixed-point constant is too large
while expanding symbol "0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
FATAL: interpolation-overflow.asm(4):
Macro argument '\1' not defined

0
test/asm/interpolation-overflow.out
View File