From 0cad3da809e35a5077bf437b9c7e67574fa82ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Mon, 9 Dec 2024 16:41:44 +0000 Subject: [PATCH] ITS#10290 Move syncrepl_modify_cb to the end of the list The way op->orm_modlist is allocated by syncrepl_op_modify is not compatible with slap_mods_free() and so callbacks from any overlays that touch op->orm_modlist on the way down need a chance to undo their state first as we go back up. --- servers/slapd/syncrepl.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index b176130721..08a52939d3 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -2793,7 +2793,6 @@ drop: typedef struct modify_ctxt { Modifications *mx_orig; - Modifications *mx_free; Entry *mx_entry; } modify_ctxt; @@ -2805,11 +2804,8 @@ syncrepl_modify_cb( Operation *op, SlapReply *rs ) Modifications *ml; op->orm_no_opattrs = 0; + slap_mods_free( op->orm_modlist, 0 ); op->orm_modlist = mx->mx_orig; - for ( ml = mx->mx_free; ml; ml = mx->mx_free ) { - mx->mx_free = ml->sml_next; - op->o_tmpfree( ml, op->o_tmpmemctx ); - } if ( mx->mx_entry ) { entry_free( mx->mx_entry ); } @@ -2997,10 +2993,10 @@ syncrepl_op_modify( Operation *op, SlapReply *rs ) sc->sc_next = op->o_callback; sc->sc_cleanup = NULL; sc->sc_writewait = NULL; - op->o_callback = sc; + overlay_callback_after_backover( op, sc, 1 ); + op->orm_no_opattrs = 1; mx->mx_orig = op->orm_modlist; - mx->mx_free = newlist; mx->mx_entry = e_dup; for ( ml = newlist; ml; ml=ml->sml_next ) { if ( ml->sml_flags == SLAP_MOD_INTERNAL ) {