Skip to content

[hotfix] gitd replication double free sds bug #449

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
qiongtubao merged 1 commit into from
Sep 2, 2026
Merged

[hotfix] gitd replication double free sds bug #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion deps/xredis-gtid
Open in desktop
Submodule xredis-gtid updated 1 files
+3 −6 xredis/xredis_gtid_repl.c
22 changes: 17 additions & 5 deletions src/replication.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,7 +2799,10 @@ int slaveTryPartialResynchronization(connection *conn, int read_reply) {
connSetReadHandler(conn, NULL);

ctrip_result = ctrip_slaveTryPartialResynchronizationRead(conn,reply);
if (ctrip_result >= 0) return ctrip_result;
if (ctrip_result >= 0) {
sdsfree(reply);
return ctrip_result;
}

if (!strncmp(reply,"+FULLRESYNC",11)) {
char *replid = NULL, *offset = NULL;
Expand Down Expand Up @@ -3771,9 +3774,9 @@ static int rdbChannelHandleFullresyncReply(connection *conn, sds *err) {

/* FULL RESYNC, parse the reply in order to extract the replid
* and the replication offset. */
if (ctrip_slaveTryPartialResynchronizationRead(conn, *err) < 0) {
/* +FULLRESYNC */
serverAssert(!strncmp(*err,"+FULLRESYNC",11));
int ctrip_result = ctrip_slaveTryPartialResynchronizationRead(conn, *err);
if (ctrip_result < 0) {
/* REDIS */
replid = strchr(*err,' ');
if (replid) {
replid++;
Expand All @@ -3787,7 +3790,16 @@ static int rdbChannelHandleFullresyncReply(connection *conn, sds *err) {
memcpy(server.master_replid, replid, offset-replid-1);
server.master_replid[CONFIG_RUN_ID_SIZE] = '\0';
server.master_initial_offset = strtoll(offset,NULL,10);
}
} else {
/* GTID */
if (ctrip_result == PSYNC_FULLRESYNC) {
/* next */
} else if (ctrip_result == PSYNC_TRY_LATER) {
return C_RETRY;
} else {
return C_ERR;
}
}
/* Prepare the main and rdb channels for rdb and repl stream delivery.*/
server.repl_state = REPL_STATE_TRANSFER;
rdbChannelReplDataBufInit();
Expand Down
Loading