From: Vladimír Čunát Date: Thu, 12 Sep 2024 12:54:16 +0000 (+0200) Subject: daemon/session2: fix error handling in *wrap_after() X-Git-Tag: v6.0.9~16^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6681fdd4ab8b017a2827f7c690283aaa97d0928;p=thirdparty%2Fknot-resolver.git daemon/session2: fix error handling in *wrap_after() We need to check the "< 0" condition *before* incrementing or decrementing the returned layer_ix. Detected by Coverity :-) --- diff --git a/daemon/session2.c b/daemon/session2.c index 0d1a69f50..8980ec0db 100644 --- a/daemon/session2.c +++ b/daemon/session2.c @@ -1189,11 +1189,11 @@ int session2_unwrap_after(struct session2 *s, enum protolayer_type protocol, const struct comm_info *comm, protolayer_finished_cb cb, void *baton) { - ssize_t layer_ix = session2_get_protocol(s, protocol) + 1; + ssize_t layer_ix = session2_get_protocol(s, protocol); if (layer_ix < 0) return layer_ix; return session2_submit(s, PROTOLAYER_UNWRAP, - layer_ix, payload, comm, cb, baton); + layer_ix + 1, payload, comm, cb, baton); } int session2_wrap(struct session2 *s, struct protolayer_payload payload, @@ -1210,10 +1210,10 @@ int session2_wrap_after(struct session2 *s, enum protolayer_type protocol, const struct comm_info *comm, protolayer_finished_cb cb, void *baton) { - ssize_t layer_ix = session2_get_protocol(s, protocol) - 1; + ssize_t layer_ix = session2_get_protocol(s, protocol); if (layer_ix < 0) return layer_ix; - return session2_submit(s, PROTOLAYER_WRAP, layer_ix, + return session2_submit(s, PROTOLAYER_WRAP, layer_ix - 1, payload, comm, cb, baton); }