fix(android): bound inline chat image payloads · openclaw/openclaw@ce039eb

Recent Commits to openclaw:main

obviyus · 2026-05-18 · via Recent Commits to openclaw:main

File tree

apps/android/app/src
- main/java/ai/openclaw/app/ui/chat
- test/java/ai/openclaw/app/ui/chat

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import kotlin.math.max`
`13`	`13`	`import kotlin.math.roundToInt`
`14`	`14`
`15`	`15`	`private const val CHAT_ATTACHMENT_MAX_WIDTH = 1600`
`16`		`-private const val CHAT_ATTACHMENT_MAX_BASE64_CHARS = 300 * 1024`
	`16`	`+internal const val CHAT_IMAGE_MAX_BASE64_CHARS = 300 * 1024`
`17`	`17`	`private const val CHAT_ATTACHMENT_START_QUALITY = 85`
`18`	`18`	`private const val CHAT_DECODE_MAX_DIMENSION = 1600`
`19`	`19`	`private const val CHAT_IMAGE_CACHE_BYTES = 16 * 1024 * 1024`
`@@ -35,7 +35,7 @@ internal fun loadSizedImageAttachment(`
`35`	`35`	`if (bitmap == null) {`
`36`	`36`	`throw IllegalStateException("unsupported attachment")`
`37`	`37`	`}`
`38`		`-val maxBytes = (CHAT_ATTACHMENT_MAX_BASE64_CHARS / 4) * 3`
	`38`	`+val maxBytes = (CHAT_IMAGE_MAX_BASE64_CHARS / 4) * 3`
`39`	`39`	`val encoded =`
`40`	`40`	`JpegSizeLimiter.compressToLimit(`
`41`	`41`	`initialWidth = bitmap.width,`

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ import org.commonmark.node.Image as MarkdownImage`
`79`	`79`	`import org.commonmark.node.Text as MarkdownTextNode`
`80`	`80`
`81`	`81`	`private const val LIST_INDENT_DP = 14`
	`82`	`+private const val DATA_IMAGE_HEADER_MAX_CHARS = 64`
`82`	`83`	`private val dataImageRegex = Regex("^data:image/([a-zA-Z0-9+.-]+);base64,([A-Za-z0-9+/=\\n\\r]+)$")`
`83`	`84`
`84`	`85`	`private val markdownParser: Parser by lazy {`
`@@ -606,9 +607,10 @@ private fun standaloneDataImage(paragraph: Paragraph): ParsedDataImage? {`
`606`	`607`	`return parseDataImageDestination(only.destination)`
`607`	`608`	`}`
`608`	`609`
`609`		`-private fun parseDataImageDestination(destination: String?): ParsedDataImage? {`
	`610`	`+internal fun parseDataImageDestination(destination: String?): ParsedDataImage? {`
`610`	`611`	`val raw = destination?.trim().orEmpty()`
`611`	`612`	`if (raw.isEmpty()) return null`
	`613`	`+if (raw.length > CHAT_IMAGE_MAX_BASE64_CHARS + DATA_IMAGE_HEADER_MAX_CHARS) return null`
`612`	`614`	`val match = dataImageRegex.matchEntire(raw) ?: return null`
`613`	`615`	`val subtype =`
`614`	`616`	`match.groupValues`
`@@ -623,6 +625,7 @@ private fun parseDataImageDestination(destination: String?): ParsedDataImage? {`
`623`	`625`	`?.trim()`
`624`	`626`	`.orEmpty()`
`625`	`627`	`if (base64.isEmpty()) return null`
	`628`	`+if (base64.length > CHAT_IMAGE_MAX_BASE64_CHARS) return null`
`626`	`629`	`return ParsedDataImage(mimeType = "image/$subtype", base64 = base64)`
`627`	`630`	`}`
`628`	`631`
`@@ -650,7 +653,7 @@ private data class TableRenderRow(`
`650`	`653`	`val cells: List<AnnotatedString>,`
`651`	`654`	`)`
`652`	`655`
`653`		`-private data class ParsedDataImage(`
	`656`	`+internal data class ParsedDataImage(`
`654`	`657`	`val mimeType: String,`
`655`	`658`	`val base64: String,`
`656`	`659`	`)`

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package ai.openclaw.app.ui.chat`
`2`	`2`
`3`	`3`	`import androidx.compose.ui.text.LinkAnnotation`
`4`	`4`	`import org.junit.Assert.assertEquals`
	`5`	`+import org.junit.Assert.assertNull`
`5`	`6`	`import org.junit.Assert.assertTrue`
`6`	`7`	`import org.junit.Test`
`7`	`8`
`@@ -39,4 +40,20 @@ class ChatMarkdownTest {`
`39`	`40`	`assertEquals("No link here", annotated.text)`
`40`	`41`	`assertTrue(annotated.getLinkAnnotations(0, annotated.length).isEmpty())`
`41`	`42`	`}`
	`43`	`+`
	`44`	`+ @Test`
	`45`	`+fun parseDataImageDestinationAcceptsBoundedPayloads() {`
	`46`	`+val parsed = parseDataImageDestination("data:image/png;base64,QUJD")`
	`47`	`+`
	`48`	`+ assertEquals(ParsedDataImage(mimeType = "image/png", base64 = "QUJD"), parsed)`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ @Test`
	`52`	`+fun parseDataImageDestinationRejectsOversizedPayloads() {`
	`53`	`+val oversized = "A".repeat(CHAT_IMAGE_MAX_BASE64_CHARS + 1)`
	`54`	`+`
	`55`	`+val parsed = parseDataImageDestination("data:image/png;base64,$oversized")`
	`56`	`+`
	`57`	`+ assertNull(parsed)`
	`58`	`+ }`
`42`	`59`	`}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree