Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

read(io, Char): fix read with too many leading ones #50552

Merged
merged 3 commits into from
Jul 17, 2023
Merged

read(io, Char): fix read with too many leading ones #50552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ef5c2e
read(io, Char): fix read with too many leading ones
StefanKarpinski Jul 14, 2023
64b062c
fix and test the other place with this bug
StefanKarpinski Jul 14, 2023
a3cb9a9
optimization suggested by stevengj
StefanKarpinski Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions base/filesystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,12 @@ end

function read(f::File, ::Type{Char})
b0 = read(f, UInt8)
l = 8 * (4 - leading_ones(b0))
l = 0x08 * (0x04 - UInt8(leading_ones(b0)))
c = UInt32(b0) << 24
if l < 24
if l ≤ 0x10
s = 16
while s ≥ l && !eof(f)
# this works around lack of peek(::File)
p = position(f)
b = read(f, UInt8)
if b & 0xc0 != 0x80
Expand Down
4 changes: 2 additions & 2 deletions base/io.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,9 +884,9 @@ end

function read(io::IO, ::Type{Char})
b0 = read(io, UInt8)::UInt8
l = 8(4-leading_ones(b0))
l = 0x08 * (0x04 - UInt8(leading_ones(b0)))
StefanKarpinski marked this conversation as resolved.
Show resolved Hide resolved
c = UInt32(b0) << 24
if l < 24
if l ≤ 0x10
stevengj marked this conversation as resolved.
Show resolved Hide resolved
s = 16
while s ≥ l && !eof(io)::Bool
peek(io) & 0xc0 == 0x80 || break
Expand Down
30 changes: 29 additions & 1 deletion test/char.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This file is a part of Julia. License is MIT: https://julialang.org/license

@testset "basic properties" begin

@test typemax(Char) == reinterpret(Char, typemax(UInt32))
@test typemin(Char) == Char(0)
@test typemax(Char) == reinterpret(Char, 0xffffffff)
Expand Down Expand Up @@ -214,6 +213,35 @@ end
end
end

# issue #50532
@testset "invalid read(io, Char)" begin
# byte values with different numbers of leading bits
B = UInt8[
0x3f, 0x4d, 0x52, 0x63, 0x81, 0x83, 0x89, 0xb6,
0xc0, 0xc8, 0xd3, 0xe3, 0xea, 0xeb, 0xf0, 0xf2,
0xf4, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
]
f = tempname()
for b1 in B, b2 in B, t = 0:3
bytes = [b1, b2]
append!(bytes, rand(B, t))
s = String(bytes)
write(f, s)
@test s == read(f, String)
chars = collect(s)
ios = [IOBuffer(s), open(f), Base.Filesystem.open(f, 0)]
for io in ios
chars′ = Char[]
while !eof(io)
push!(chars′, read(io, Char))
end
@test chars == chars′
close(io)
end
end
rm(f)
end

@testset "overlong codes" begin
function test_overlong(c::Char, n::Integer, rep::String)
if isvalid(c)
Expand Down