Skip to content

Fix crash when JSONObject is backed by immutable Kotlin map #755

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

Merged
qnga merged 3 commits into from
Feb 17, 2026
Merged

Fix crash when JSONObject is backed by immutable Kotlin map #755

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b59df7
Fix crash when JSONObject is backed by immutable Kotlin map
Feb 16, 2026
df0a5b3
Use toMutableMap() instead of HashMap() for clarity
Feb 17, 2026
160edaf
Update readium/shared/src/main/java/org/readium/r2/shared/publication…
qnga Feb 17, 2026
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
6 changes: 4 additions & 2 deletions readium/shared/src/main/java/org/readium/r2/shared/publication/Locator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ public data class Locator(
val otherLocations: @WriteWith<JSONParceler> Map<String, Any> = emptyMap(),
) : JSONable, Parcelable {

override fun toJSON(): JSONObject = JSONObject(otherLocations).apply {
// Some versions of org.json's JSONObject(Map) store the reference directly
// without copying, so the map must be mutable.
override fun toJSON(): JSONObject = JSONObject(otherLocations.toMutableMap()).apply {
putIfNotEmpty("fragments", fragments)
put("progression", progression)
put("position", position)
Expand Down Expand Up @@ -285,7 +287,7 @@ public data class LocatorCollection(
*/
val title: String? get() = localizedTitle?.string

override fun toJSON(): JSONObject = JSONObject(otherMetadata).apply {
override fun toJSON(): JSONObject = JSONObject(otherMetadata.toMutableMap()).apply {
putIfNotEmpty("title", localizedTitle)
putOpt("numberOfItems", numberOfItems)
}
Expand Down
2 changes: 1 addition & 1 deletion readium/shared/src/main/java/org/readium/r2/shared/publication/Metadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public data class Metadata(
/**
* Serializes a [Metadata] to its RWPM JSON representation.
*/
override fun toJSON(): JSONObject = JSONObject(otherMetadata).apply {
override fun toJSON(): JSONObject = JSONObject(otherMetadata.toMutableMap()).apply {
put("identifier", identifier)
put("@type", type)
putIfNotEmpty("conformsTo", conformsTo.map { it.uri })
Expand Down
2 changes: 1 addition & 1 deletion readium/shared/src/main/java/org/readium/r2/shared/publication/Properties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public data class Properties(
/**
* Serializes a [Properties] to its RWPM JSON representation.
*/
override fun toJSON(): JSONObject = JSONObject(otherProperties)
override fun toJSON(): JSONObject = JSONObject(otherProperties.toMutableMap())

/**
* Makes a copy of this [Properties] after merging in the given additional other [properties].
Expand Down
Loading