[S] Change in libosmocore[master]: osmo_io: Don't pretend to support backends without close_cb

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36191?usp=email ) Change subject: osmo_io: Don't pretend to support backends without close_cb ...................................................................... osmo_io: Don't pretend to support backends without close_cb Let's not pretend we support backends without a close_cb. In such situations nobody would actually close(2) the file descriptor, but we would set iofd->fd to -1, effectively creating a file descriptor leak. Both of our two back-ends provide a close_cb, and we don't need to consider hypothetical future back-ends that would not like to register such a call-back. Related: OS#6393 Change-Id: Id285f1d7b73ae5805aa618897016ae8b73bf892d --- M src/core/osmo_io.c 1 file changed, 21 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index bcd4add..8b53aa6 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -787,8 +787,8 @@ iofd->pending = NULL; - if (osmo_iofd_ops.close) - rc = osmo_iofd_ops.close(iofd); + OSMO_ASSERT(osmo_iofd_ops.close); + rc = osmo_iofd_ops.close(iofd); iofd->fd = -1; return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36191?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id285f1d7b73ae5805aa618897016ae8b73bf892d Gerrit-Change-Number: 36191 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged