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

improve deserialize error message #31374

Merged
merged 3 commits into from
Apr 4, 2019
+16 −3
Merged

improve deserialize error message #31374

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b70764d
improve deserialize error message
GregPlowman Mar 16, 2019
9023016
revise deserialize error message wording
GregPlowman Mar 16, 2019
e24bf7d
remove double table lookup
GregPlowman Mar 19, 2019
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
19 changes: 16 additions & 3 deletions stdlib/Serialization/src/Serialization.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,19 @@ function resolve_ref_immediately(s::AbstractSerializer, @nospecialize(x))
nothing
end

function gettable(s::AbstractSerializer, id::Int)
get(s.table, id) do
errmsg = """Inconsistent Serializer state when deserializing.
Attempt to access internal table with key $id failed.

This might occur if the Serializer contexts when serializing and deserializing are inconsistent.
In particular, if multiple serialize calls use the same Serializer object then
the corresponding deserialize calls should also use the same Serializer object.
"""
error(errmsg)
end
end

# deserialize_ is an internal function to dispatch on the tag
# describing the serialized representation. the number of
# representations is fixed, so deserialize_ does not get extended.
Expand All @@ -750,10 +763,10 @@ function handle_deserialize(s::AbstractSerializer, b::Int32)
return deserialize_tuple(s, Int(read(s.io, UInt8)::UInt8))
elseif b == SHORTBACKREF_TAG
id = read(s.io, UInt16)::UInt16
return s.table[Int(id)]
return gettable(s, Int(id))
elseif b == BACKREF_TAG
id = read(s.io, Int32)::Int32
return s.table[Int(id)]
return gettable(s, Int(id))
elseif b == ARRAY_TAG
return deserialize_array(s)
elseif b == DATATYPE_TAG
Expand Down Expand Up @@ -800,7 +813,7 @@ function handle_deserialize(s::AbstractSerializer, b::Int32)
return deserialize_expr(s, Int(read(s.io, Int32)::Int32))
elseif b == LONGBACKREF_TAG
id = read(s.io, Int64)::Int64
return s.table[Int(id)]
return gettable(s, Int(id))
elseif b == LONGSYMBOL_TAG
return deserialize_symbol(s, Int(read(s.io, Int32)::Int32))
elseif b == HEADER_TAG
Expand Down