Berry fix string.format crash

This commit is contained in:
Stephan Hadinger 2021-12-28 12:09:00 +01:00
parent 74e7d065ed
commit c1e3d88f2f
2 changed files with 42 additions and 1 deletions

View File

@ -578,7 +578,7 @@ static int str_format(bvm *vm)
break;
case 's': {
const char *s = be_tostring(vm, index);
int len = be_strlen(vm, 2);
int len = be_strlen(vm, index);
if (len > 100 && strlen(mode) == 2) {
be_pushvalue(vm, index);
} else {

View File

@ -39,3 +39,44 @@ s="azerty"
assert(s[1..2] == "ze")
assert(s[1..] == "zerty")
assert(s[1..-1] == "zerty")
#- string ranges -#
s="azertyuiop"
assert(s[0] == "a")
assert(s[0..1] == "az")
assert(s[0..2] == "aze")
assert(s[0..10] == s)
assert(s[0..size(s)] == s)
assert(s[0..50] == s) #- upper limit is allowed to be out of range -#
#- negative indices start from the end -#
s="azertyuiop"
assert(s[-1] == "p")
assert(s[-2] == "o")
assert(s[0..-2] == "azertyuio")
assert(s[-4..-2] == "uio")
assert(s[-2..-4] == "") #- if range is in wrong order, returns empty string -#
assert(s[-40..-2] == "azertyuio") #- borders are allowed to be out of range -#
# escape
import string
assert(string.escape("A") == '"A"')
assert(string.escape("A", true) == "'A'")
assert(string.escape("\"") == '"\\""')
assert(string.escape("\"", true) == '\'"\'')
var s ='"a\'b"\''
assert(string.escape(s) == '"\\"a\'b\\"\'"')
assert(string.escape(s, true) == '\'"a\\\'b"\\\'\'')
# tr
assert(string.tr("azer", "abcde", "ABCDE") == 'AzEr')
assert(string.tr("azer", "", "") == 'azer')
assert(string.tr("azer", "aaa", "ABC") == 'Azer') # only first match works
assert(string.tr("A_b", "_", " ") == 'A b')
# tr used to remove characters
assert(string.tr("qwerty", "qwe", "_") == '_rty')
# the following should not crash
var s1 = 'A string of more than 128 bytes 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789'
var s2 = string.format("%i, %s", 1, s1)