bughz/predixy
1
0
Fork 0
mirror of https://github.com/joyieldInc/predixy.git synced 2026-02-05 01:42:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix scan parse buf

Browse Source
This commit is contained in:
denniszgyu 2026-01-15 14:26:21 +08:00
parent b059744c5f
commit 83e887fc77
1 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Handler.cpp
View File

@ -841,12 +841,28 @@ void Handler::handleResponse(ConnectConnection* s, Request* req, Response* res)
} }
} else if (req->type() == Command::Scan && s && res->type() == Reply::Array) { } else if (req->type() == Command::Scan && s && res->type() == Reply::Array) {
SegmentStr<64> str(res->body()); SegmentStr<64> str(res->body());
if (const char* p = strchr(str.data() + sizeof("*2\r\n$"), '\n')) { // SCAN response format: *2\r\n$<len>\r\n<cursor>\r\n*<count>\r\n...
// Skip "*2\r\n$" (5 bytes) and find the first '\n' after the length number
// Add boundary check to prevent buffer overflow
const char* start = str.data();
int len = str.length();
if (len >= 5) {
const char* end = start + len;
const char* p = start + 5; // Skip "*2\r\n$" (5 bytes, not sizeof which returns 8!)
// Find '\n' within buffer boundary (safer than strchr)
while (p < end && *p != '\n') {
p++;
}
if (p < end) { // Found '\n'
// Use 128-bit integer to handle large cursor values (Kvrocks may return cursor close to 64-bit limit) // Use 128-bit integer to handle large cursor values (Kvrocks may return cursor close to 64-bit limit)
__uint128_t cursor = 0; __uint128_t cursor = 0;
const char* cursorStr = p + 1; const char* cursorStr = p + 1;
const char* cursorStart = cursorStr; const char* cursorStart = cursorStr;
while (*cursorStr >= '0' && *cursorStr <= '9') {
// Parse cursor digits within buffer boundary
while (cursorStr < end && *cursorStr >= '0' && *cursorStr <= '9') {
cursor = cursor * 10 + (*cursorStr - '0'); cursor = cursor * 10 + (*cursorStr - '0');
cursorStr++; cursorStr++;
} }
@ -868,7 +884,14 @@ void Handler::handleResponse(ConnectConnection* s, Request* req, Response* res)
// Use 128-bit integer for left shift, will not overflow // Use 128-bit integer for left shift, will not overflow
cursor <<= Const::ServGroupBits; cursor <<= Const::ServGroupBits;
cursor |= g->id(); cursor |= g->id();
if ((p = strchr(p, '*')) != nullptr) {
// Find '*' within buffer boundary
const char* asteriskPos = p + 1;
while (asteriskPos < end && *asteriskPos != '*') {
asteriskPos++;
}
if (asteriskPos < end) { // Found '*'
// Convert 128-bit integer to string // Convert 128-bit integer to string
char buf[64]; // 128-bit needs at most 39 decimal digits char buf[64]; // 128-bit needs at most 39 decimal digits
int n = Util::uint128ToString(cursor, buf); int n = Util::uint128ToString(cursor, buf);
@ -882,7 +905,7 @@ void Handler::handleResponse(ConnectConnection* s, Request* req, Response* res)
"$%d\r\n" "$%d\r\n"
"%s\r\n", "%s\r\n",
n, buf); n, buf);
res->body().cut(p - str.data()); res->body().cut(asteriskPos - start);
} }
} else { } else {
// Scan completed, return 0 to client // Scan completed, return 0 to client
@ -891,6 +914,7 @@ void Handler::handleResponse(ConnectConnection* s, Request* req, Response* res)
} }
} }
} }
}
if (req->leader()) { if (req->leader()) {
res->adjustForLeader(req); res->adjustForLeader(req);
} }