navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-26 20:16:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: jv_dump_string_trunc should not break unicode characters (#3249)

Browse Source
This commit is contained in:
itchyny authored and GitHub committed 2025-02-16 21:40:18 +09:00
1 parent fa6a2ff688
commit 64bd8ba374
2 files changed
+23 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/jv_print.c
+10 -9
View File
@@ -381,16 +381,17 @@ jv jv_dump_string(jv x, int flags) {
}
char *jv_dump_string_trunc(jv x, char *outbuf, size_t bufsize) {
x = jv_dump_string(x,0);
const char* p = jv_string_value(x);
const size_t len = strlen(p);
strncpy(outbuf, p, bufsize);
outbuf[bufsize - 1] = 0;
x = jv_dump_string(x, 0);
const char *str = jv_string_value(x);
const size_t len = strlen(str);
strncpy(outbuf, str, bufsize);
if (len > bufsize - 1 && bufsize >= 4) {
// Indicate truncation with '...'
outbuf[bufsize - 2]='.';
outbuf[bufsize - 3]='.';
outbuf[bufsize - 4]='.';
// Indicate truncation with '...' without breaking UTF-8.
const char *s = jvp_utf8_backtrack(outbuf + bufsize - 4, outbuf, NULL);
if (s) bufsize = s + 4 - outbuf;
strcpy(outbuf + bufsize - 4, "...");
} else {
outbuf[bufsize - 1] = '\0';
}
jv_free(x);
return outbuf;
tests/jq.test
+13
View File
@@ -1788,6 +1788,19 @@ try -. catch .
"very-long-string"
"string (\"very-long-...) cannot be negated"
try (.-.) catch .
"very-long-string"
"string (\"very-long-...) and string (\"very-long-...) cannot be subtracted"
"x" * range(0; 12; 2) + "☆" * 5 | try -. catch .
null
"string (\"☆☆☆...) cannot be negated"
"string (\"xx☆☆...) cannot be negated"
"string (\"xxxx☆☆...) cannot be negated"
"string (\"xxxxxx☆...) cannot be negated"
"string (\"xxxxxxxx...) cannot be negated"
"string (\"xxxxxxxxxx...) cannot be negated"
join(",")
["1",2,true,false,3.4]
"1,2,true,false,3.4"