From 23ece0fab7884ed721c9e3873490722defd17780 Mon Sep 17 00:00:00 2001 From: Jamie Liu Date: Thu, 4 Dec 2025 15:19:15 -0800 Subject: [PATCH] state: fix nil dereference when encodeState.Save() => wire.Save() fails PiperOrigin-RevId: 840424588 --- pkg/state/encode.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/state/encode.go b/pkg/state/encode.go index 861be309fc..c5b4a079e0 100644 --- a/pkg/state/encode.go +++ b/pkg/state/encode.go @@ -802,14 +802,19 @@ func (es *encodeState) Save(obj reflect.Value) { }) for _, id := range ids { // Encode the id. + oes = nil wire.Save(&es.w, wire.Uint(id)) // Marshal the object. - oes := es.pending[id] + oes = es.pending[id] wire.Save(&es.w, oes.encoded) } }); err != nil { - // Include the object and the error. - Failf("error serializing object %#v: %w", oes.encoded, err) + if oes != nil { + // Include the object and the error. + Failf("error serializing object %#v: %w", oes.encoded, err) + } else { + Failf("error serializing type or ID: %w", err) + } } }