mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

urllib: a temporary autofree fix

Browse Source
This commit is contained in:
Alexander Medvednikov 2021-03-15 21:12:11 +01:00
parent 0823ea4af1
commit 77d5fcca59
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/builtin/string.v
View File

@ -604,9 +604,17 @@ fn (s string) substr2(start int, _end int, end_max bool) string {
// Example: assert 'ABCD'.substr(1,3) == 'BC'
pub fn (s string) substr(start int, end int) string {
$if !no_bounds_checking ? {
if start > end || start > s.len || end > s.len || start < 0 || end < 0 {
panic('substr($start, $end) out of bounds (len=$s.len)')
/*
$if debug {
if start > end || start > s.len || end > s.len || start < 0 || end < 0 {
println('substr($start, $end) out of bounds (len=$s.len)')
println('s="$s"')
print_backtrace()
return ''
}
}
*/
panic('substr($start, $end) out of bounds (len=$s.len)')
}
len := end - start
if len == s.len {

8
vlib/net/urllib/urllib.v
View File

@ -745,8 +745,12 @@ pub fn (u URL) str() string {
// preceded by a dot-segment (e.g., './this:that') to make a relative-
// path reference.
i := path.index_byte(`:`)
if i > -1 && path[..i].index_byte(`/`) == -1 {
buf.write_string('./')
if i > -1 {
// TODO remove this when autofree handles tmp
// expressions like this
if i > -1 && path[..i].index_byte(`/`) == -1 {
buf.write_string('./')
}
}
}
buf.write_string(path)