Skip to contentSkip to conversation

agent: Always inform upper layer via callback

PATCH In review Daniel Wagner 2 participants 3 messages Jun 29, 2021 – Jun 30, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 agent: Always inform upper layer via callback

The upper state machine expects to be called in all cases. Do not silenty eat up the callback.

Fixes 8ea2d67a6e89 ("service: Complete only after user connection retries")

Reported by John Keeping

---
 src/agent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/agent.c +1 -1
index d6113af745fa..d4f9add478fb 100644
@@ -366,9 +366,9 @@ static void report_error_reply(DBusMessage *reply, void *user_data)
 			retry = true;
 	}
 
+out:
 	report_error->callback(report_error->user_context, retry,
 			report_error->user_data);
-out:
 	g_free(report_error);
 }
 
Signature · 1 line
2.32.0
Tested-by on v1 1/1
#1 lore raw
Quoted 5 lines · On Tue, 29 Jun 2021 09:33:26 +0200 Daniel Wagner <[email protected]> wrote:

The upper state machine expects to be called in all cases. Do not silenty eat up the callback.

Fixes 8ea2d67a6e89 ("service: Complete only after user connection retries")

Reported by John Keeping

I've run through a few tests with this patch and it looks good!

Thanks for tracking down the issue here.

John

#2 lore raw

Hi John,

Quoted 6 lines · John Keeping
Quoted 3 lines · On Tue, 29 Jun 2021 09:33:26 +0200 Daniel Wagner <[email protected]> wrote:

The upper state machine expects to be called in all cases. Do not silenty eat up the callback.

Quoted 8 lines
Quoted 2 lines
Fixes 8ea2d67a6e89 ("service: Complete only after user connection retries")

Reported by John Keeping

I've run through a few tests with this patch and it looks good!

Thanks for tracking down the issue here.

Thanks for testing. Patch applied.
Daniel