From e2596f03bdc0a5997664bf317d8a277f13b16b51 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 20 Nov 2026 12:01:35 +0100 Subject: [PATCH] fix(nav3): Serialize non-finite arguments as strings --- CHANGELOG.md | 2 + .../navigation3/BackStackEntryMapper.kt | 2 +- .../internal/backstack/BackStackConverter.kt | 9 +++- .../ArgumentNumberSerializationTest.kt | 49 +++++++++++++++++++ 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentNumberSerializationTest.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index bda85b57b3..d7f627b40d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ ### Fixes +- Nav3: `NaN` and infinite numbers in back stack entry arguments are now sent as the strings `"NaN"`, `"Infinity"`, and `"-Infinity"`, instead of causing the event they're attached to be dropped ([#PR_NUMBER](https://github.com/getsentry/sentry-java/pull/PR_NUMBER)) + - Kotlin now sees `Attachment.getBytes()`, `Device.getArchs()`, `Spring.getActiveProfiles()` and `JsonSerializationUtils.bytesFrom(...)` as nullable, because `@Nullable` now annotates the returned array instead of its elements ([#6558](https://github.com/getsentry/sentry-java/pull/6558)) - Shake-to-report no longer leaks the first Activity that resumes after `Sentry.init` ([#6686](https://github.com/getsentry/sentry-java/pull/6686)) diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt index f2af4c27fe..b4b93fa474 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt @@ -91,7 +91,7 @@ public class SentryBackStackEntry( * - [CharSequence] * - [Char] * - [Boolean] - * - any [Number] + * - any [Number] (`NaN` and infinite values are sent as strings) * - enums (via [Enum.name]) * - `null` * diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt index d20ba285fd..aef70e08bb 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt @@ -220,8 +220,11 @@ internal class BackStackConverter( private fun sanitizeScalar(value: Any?): Any? = when (value) { null, - is Number, is Boolean -> value + is Number -> + if (value.isNonFinite()) { + value.toString().also { consumeCharacters(it.length) } + } else value is String -> value.also { consumeCharacters(it.length) } is CharSequence, is Char -> value.toString().also { consumeCharacters(it.length) } @@ -433,3 +436,7 @@ internal enum class ArgumentDropReason( const val ARGUMENT_DROP_REASON_KEY = "dropped_by_sentry" } } + +/** Whether this is a NaN or infinite Double or Float. */ +private fun Number.isNonFinite(): Boolean = + (this is Double && !isFinite()) || (this is Float && !isFinite()) diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentNumberSerializationTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentNumberSerializationTest.kt new file mode 100644 index 0000000000..36da2db3c8 --- /dev/null +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentNumberSerializationTest.kt @@ -0,0 +1,49 @@ +package io.sentry.compose.navigation3.internal.backstack + +import com.google.common.truth.Truth.assertThat +import io.sentry.JsonSerializer +import io.sentry.NoOpLogger +import io.sentry.SentryOptions +import io.sentry.compose.navigation3.BackStackEntryMapper +import io.sentry.compose.navigation3.SentryBackStackEntry +import java.io.StringWriter +import org.junit.Test + +class ArgumentNumberSerializationTest { + @Test + fun `non-finite numbers produce valid event JSON`() { + val mapper = + BackStackEntryMapper { + SentryBackStackEntry( + "Home", + mapOf( + "price" to Double.NaN, + "limits" to floatArrayOf(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY), + ), + ) + } + val converter = + BackStackConverter(ForwardingBackStackEntryMapper { mapper }, NoOpLogger.getInstance()) + val entry = + converter.convert(listOf(Any()), BackStackConverter.RetentionPolicy.KEEP_FIRST).single() + val json = StringWriter() + JsonSerializer(SentryOptions()).serialize(entry.serialize(), json) + assertThat(json.toString()) + .isEqualTo( + """{"entry":"/Home","entry_arguments":{"price":"NaN","limits":["Infinity","-Infinity"]}}""", + ) + } + + @Test + fun `non-finite number text spends the character budget`() { + val sanitizer = + BackStackConverter.ArgumentSanitizer( + NoOpLogger.getInstance(), + BackStackConverter.WarningState(), + ) + val values = + mapOf("x" to "a".repeat(ArgumentConstraints.MAX_ARGUMENT_CHARACTERS - 3), "n" to Double.NaN) + assertThat(sanitizer.sanitizeEntry(values).dropReason) + .isEqualTo(ArgumentDropReason.CHARACTER_LIMIT) + } +}