jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Orc] fixes "streams.readDataStr segafaults" when accepting a string literal (#20019) [backport]

Browse source 
fixes streams.readDataStr accept a string literal
This commit is contained in:
flywind 2022-07-15 15:42:54 +08:00 • committed by GitHub
commit 286fcef68e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/streams.nim
View file

@ -1197,6 +1197,11 @@ else: # after 1.3 or JS not defined
proc ssReadDataStr(s: Stream, buffer: var string, slice: Slice[int]): int = proc ssReadDataStr(s: Stream, buffer: var string, slice: Slice[int]): int =
var s = StringStream(s) var s = StringStream(s)
when nimvm:
discard
else:
when declared(prepareMutation):
prepareMutation(buffer) # buffer might potentially be a CoW literal with ARC
result = min(slice.b + 1 - slice.a, s.data.len - s.pos) result = min(slice.b + 1 - slice.a, s.data.len - s.pos)
if result > 0: if result > 0:
jsOrVmBlock: jsOrVmBlock:

10
tests/stdlib/tstreams.nim
View file

@ -85,3 +85,13 @@ block:
static: # Ensure streams it doesnt break with nimscript on arc/orc #19716 static: # Ensure streams it doesnt break with nimscript on arc/orc #19716
let s = newStringStream("a") let s = newStringStream("a")
doAssert s.data == "a" doAssert s.data == "a"
template main =
var strm = newStringStream("abcde")
var buffer = "12345"
doAssert strm.readDataStr(buffer, 0..3) == 4
doAssert buffer == "abcd5"
strm.close()
static: main()
main()