morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-16 01:16:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-varlink: if we reply to errors without passing to callback, go through regular error path

Browse Source 
If replying with an error fails, we should failt the whole connection,
and not leave the connection in a weird state.
This commit is contained in:
Lennart Poettering
2024-10-30 15:19:12 +01:00
committed by Yu Watanabe
parent 885691d454
commit 0118074f85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-varlink/sd-varlink.c
View File

@@ -1362,7 +1362,7 @@ static int varlink_dispatch_method(sd_varlink *v) {
if (v->state == VARLINK_PROCESSING_METHOD) {
r = sd_varlink_error(v, SD_VARLINK_ERROR_EXPECTED_MORE, NULL);
if (r < 0)
return r;
goto fail;
}
} else if (r < 0) {
/* Please adjust test/units/end.sh when updating the log message. */
@@ -1372,7 +1372,7 @@ static int varlink_dispatch_method(sd_varlink *v) {
if (IN_SET(v->state, VARLINK_PROCESSING_METHOD, VARLINK_PROCESSING_METHOD_MORE)) {
r = sd_varlink_error_invalid_parameter_name(v, bad_field);
if (r < 0)
return r;
goto fail;
}
}
@@ -1388,14 +1388,14 @@ static int varlink_dispatch_method(sd_varlink *v) {
if (IN_SET(v->state, VARLINK_PROCESSING_METHOD, VARLINK_PROCESSING_METHOD_MORE)) {
r = sd_varlink_error_errno(v, r);
if (r < 0)
return r;
goto fail;
}
}
}
} else if (IN_SET(v->state, VARLINK_PROCESSING_METHOD, VARLINK_PROCESSING_METHOD_MORE)) {
r = sd_varlink_errorbo(v, SD_VARLINK_ERROR_METHOD_NOT_FOUND, SD_JSON_BUILD_PAIR("method", SD_JSON_BUILD_STRING(method)));
if (r < 0)
return r;
goto fail;
}
switch (v->state) {