Fix nil pointer map values not being marshaled#1025
Merged
Conversation
When marshaling a map with nil pointer values, the keys were being
silently dropped, breaking round-trip fidelity. For example:
map[string]*struct{}{"foo": nil}
Would produce an empty TOML document instead of "[foo]".
This change converts nil pointer values in maps to their zero values
(consistent with how nil pointers in slices are handled), allowing the
keys to be preserved as empty tables.
Nil interface values (map[string]any{"foo": nil}) are still skipped
since there's no type information to derive a zero value.
Fixes #975
Replace naked return with explicit return values.
Preallocate the keys slice since we know the size from se.Errors.
- Explicitly set golangci-lint version in lint.yml to ensure consistent behavior across CI runs - Update AGENTS.md with instructions to use the same linter version locally
pelletier
force-pushed
the
claude/fix-go-toml-975-Ltp8u
branch
from
1b45a5f to
81eb1a6
Compare
Maks1mS
pushed a commit
to stplr-dev/stplr
that referenced
this pull request
Mar 25, 2026
…374) This PR contains the following updates: | Package | Type | Update | Change | OpenSSF | |---|---|---|---|---| | [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) | require | minor | `v2.2.4` → `v2.3.0` | [](https://securityscorecards.dev/viewer/?uri=github.com/pelletier/go-toml) | --- >⚠️ **Warning** > > Some dependencies could not be looked up. Check the [Dependency Dashboard](issues/23) for more information. --- ### Release Notes <details> <summary>pelletier/go-toml (github.com/pelletier/go-toml/v2)</summary> ### [`v2.3.0`](https://github.com/pelletier/go-toml/releases/tag/v2.3.0) [Compare Source](pelletier/go-toml@v2.2.4...v2.3.0) This is the first release built largely with the help of AI coding agents. Highlights include the complete removal of the unsafe package. go-toml is now fully safe Go code, with a geomean overhead of only \~1.4% vs v2.2.4 and zero additional allocations on benchmarks. This release also adds omitzero struct tag support, improves UnmarshalText/Unmarshaler handling for tables and array tables, and fixes several bugs including nil pointer marshaling, leap second handling, and datetime unmarshaling panics. <!-- Release notes generated using configuration in .github/release.yml at v2.3.0 --> #### What's Changed ##### What's new - marshal: don't escape quotes unnecessarily by [@​virtuald](https://github.com/virtuald) in [#​991](pelletier/go-toml#991) - Add `omitzero` tag support by [@​NathanBaulch](https://github.com/NathanBaulch) in [#​998](pelletier/go-toml#998) - Support custom IsZero() methods with omitzero tag by [@​pelletier](https://github.com/pelletier) in [#​1020](pelletier/go-toml#1020) - UnmarshalText fallbacks to struct unmarshaling for tables and arrays by [@​pelletier](https://github.com/pelletier) in [#​1026](pelletier/go-toml#1026) - \[unstable] Support Unmarshaler interface for tables and array tables by [@​pelletier](https://github.com/pelletier) in [#​1027](pelletier/go-toml#1027) ##### Fixed bugs - Add missing UnmarshalTOML call by [@​pelletier](https://github.com/pelletier) in [#​996](pelletier/go-toml#996) - Handle array table into an empty slice by [@​pelletier](https://github.com/pelletier) in [#​997](pelletier/go-toml#997) - Unwrap strict errors by [@​bersace](https://github.com/bersace) in [#​1012](pelletier/go-toml#1012) - Fix leap second handling found by fuzz by [@​pelletier](https://github.com/pelletier) in [#​1019](pelletier/go-toml#1019) - Fix nil pointer map values not being marshaled by [@​pelletier](https://github.com/pelletier) in [#​1025](pelletier/go-toml#1025) - Fix panic when unmarshaling datetime values to incompatible types ([#​1028](pelletier/go-toml#1028)) by [@​pelletier](https://github.com/pelletier) in [#​1029](pelletier/go-toml#1029) - Fix parser error pointing to wrong line at EOF without trailing newline by [@​pelletier](https://github.com/pelletier) in [#​1041](pelletier/go-toml#1041) ##### Documentation - Improve Unmarshaling README by [@​heckelson](https://github.com/heckelson) in [#​1016](pelletier/go-toml#1016) - Create AGENTS.md guidelines file by [@​pelletier](https://github.com/pelletier) in [#​1017](pelletier/go-toml#1017) ##### Other changes - Unsafe package removal by [@​pelletier](https://github.com/pelletier) in [#​1021](pelletier/go-toml#1021) - Bump CI and test scripts to Go 1.26 by [@​pelletier](https://github.com/pelletier) in [#​1030](pelletier/go-toml#1030) #### New Contributors - [@​virtuald](https://github.com/virtuald) made their first contribution in [#​991](pelletier/go-toml#991) - [@​NathanBaulch](https://github.com/NathanBaulch) made their first contribution in [#​999](pelletier/go-toml#999) - [@​bersace](https://github.com/bersace) made their first contribution in [#​1012](pelletier/go-toml#1012) - [@​flyn-org](https://github.com/flyn-org) made their first contribution in [#​1013](pelletier/go-toml#1013) - [@​heckelson](https://github.com/heckelson) made their first contribution in [#​1016](pelletier/go-toml#1016) **Full Changelog**: <pelletier/go-toml@v2.2.4...v2.3.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At 12:00 AM through 04:59 AM and 10:00 PM through 11:59 PM, Monday through Friday ( * 0-4,22-23 * * 1-5 ), Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44Ni4xIiwidXBkYXRlZEluVmVyIjoiNDMuODYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiS2luZC9EZXBlbmRlbmNpZXMiXX0=--> Reviewed-on: https://altlinux.space/stapler/stplr/pulls/374 Co-authored-by: Renovate Bot <stapler-helper-bot@noreply.altlinux.space> Co-committed-by: Renovate Bot <stapler-helper-bot@noreply.altlinux.space>
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When marshaling a map with nil pointer values, the keys were being silently dropped, breaking round-trip fidelity. For example:
Would produce an empty TOML document instead of "[foo]".
This change converts nil pointer values in maps to their zero values (consistent with how nil pointers in slices are handled), allowing the keys to be preserved as empty tables.
Nil interface values (map[string]any{"foo": nil}) are still skipped since there's no type information to derive a zero value.
Fixes #975