chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix JSON datatype string value truncated by '\0' (#5482)

Browse Source
This commit is contained in:
dingxiaobo
2025-08-05 14:22:00 +08:00
committed by GitHub
parent 1e37fe2dee
commit 16831825b8
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/JsonConversion.java
View File

@@ -158,7 +158,7 @@ public class JsonConversion {
throw new IllegalArgumentException("illegal json data"); throw new IllegalArgumentException("illegal json data");
} }
return new Json_Value(Json_enum_type.STRING, return new Json_Value(Json_enum_type.STRING,
buffer.rewind().forward((int) n).getFixString((int) str_len, charset)); buffer.rewind().forward((int) n).getFixStringIgnore0000((int) str_len, charset));
case JSONB_TYPE_OPAQUE: case JSONB_TYPE_OPAQUE:
/* /*
* There should always be at least one byte, which tells the field type of the * There should always be at least one byte, which tells the field type of the
@@ -257,7 +257,7 @@ public class JsonConversion {
// entry, always two // entry, always two
// bytes. // bytes.
long key_length = m_data.getUint16(); long key_length = m_data.getUint16();
return m_data.rewind().forward((int) key_offset).getFixString((int) key_length, charset); return m_data.rewind().forward((int) key_offset).getFixStringIgnore0000((int) key_length, charset);
} }
public Json_Value element(int i, Charset charset) { public Json_Value element(int i, Charset charset) {
@@ -400,7 +400,7 @@ public class JsonConversion {
} }
buf.append('"').append(text).append('"'); buf.append('"').append(text).append('"');
} else { } else {
text = m_data.getFixString((int) m_length, charset); text = m_data.getFixStringIgnore0000((int) m_length, charset);
buf.append('"').append(escapse(text)).append('"'); buf.append('"').append(escapse(text)).append('"');
} }

16
dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogBuffer.java
View File

@@ -1156,6 +1156,22 @@ public class LogBuffer {
return string; return string;
} }
/**
* Return next fix length string from buffer. ignore \0
*/
public final String getFixStringIgnore0000(final int len, Charset charset) {
if (position + len > origin + limit) {
throw new IllegalArgumentException("limit excceed: " + (position + len - origin));
}
final int from = position;
byte[] buf = buffer;
String string = new String(buf, from, len, charset);
position += len;
return string;
}
public final String getFixName(final int len, Charset charset) { public final String getFixName(final int len, Charset charset) {
if (position + len > origin + limit) { if (position + len > origin + limit) {
throw new IllegalArgumentException("limit excceed: " + (position + len - origin)); throw new IllegalArgumentException("limit excceed: " + (position + len - origin));