diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2024-09-13 10:24:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2024-09-15 10:31:06 +0200 |
| commit | 0cdbeb51b52bf0325626ffe88d1e851231b8b7e9 (patch) | |
| tree | fead5bdc3e8b1ae1858cf802f8b962b16afd15ed /daemon/session2.c | |
| parent | Merge !1612: coverity fixes (diff) | |
| download | knot-resolver-0cdbeb51b52bf0325626ffe88d1e851231b8b7e9.tar.xz knot-resolver-0cdbeb51b52bf0325626ffe88d1e851231b8b7e9.zip | |
daemon/session2: more Coverity in *wrap_after()
Let's assert that we don't run over the edge.
If I look right, so far we don't use this in a way
that this could happen, and I can't see how it would make sense.
Diffstat (limited to 'daemon/session2.c')
| -rw-r--r-- | daemon/session2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/daemon/session2.c b/daemon/session2.c index 217c06eb..0be121fa 100644 --- a/daemon/session2.c +++ b/daemon/session2.c @@ -1193,8 +1193,9 @@ int session2_unwrap_after(struct session2 *s, enum protolayer_type protocol, protolayer_finished_cb cb, void *baton) { ssize_t layer_ix = session2_get_protocol(s, protocol); - if (layer_ix < 0) - return layer_ix; + bool ok = layer_ix >= 0 && layer_ix + 1 < protolayer_grps[s->proto].num_layers; + if (kr_fails_assert(ok)) // not found or "last layer" + return kr_error(EINVAL); return session2_submit(s, PROTOLAYER_UNWRAP, layer_ix + 1, payload, comm, cb, baton); } @@ -1214,8 +1215,8 @@ int session2_wrap_after(struct session2 *s, enum protolayer_type protocol, protolayer_finished_cb cb, void *baton) { ssize_t layer_ix = session2_get_protocol(s, protocol); - if (layer_ix < 0) - return layer_ix; + if (kr_fails_assert(layer_ix > 0)) // not found or "last layer" + return kr_error(EINVAL); return session2_submit(s, PROTOLAYER_WRAP, layer_ix - 1, payload, comm, cb, baton); } |