Osmocom Open Build Service

libosmocore.spec Changed

commit_2b34e92d0e2de3b63636b1e2e2d5eb1bd850c10c.txt Deleted

commit_e486e012c8a9eddfedadd98f48161128287b0d6d.txt Added

libosmocore_1.8.0.234.2b34e.dsc -> libosmocore_1.8.0.236.e486.dsc Changed

@@ -2,13 +2,13 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec0, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore20, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm18, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty9, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.8.0.234.2b34e
+Version: 1.8.0.236.e486
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
 Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmocore
 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore
-Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libgnutls28-dev, doxygen, libpcsclite-dev, pkg-config, libtalloc-dev (>= 2.1.0), libsctp-dev, libusb-1.0-0-dev, libmnl-dev, libsystemd-dev, python3:native
+Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libgnutls28-dev, doxygen, libpcsclite-dev, pkg-config, libtalloc-dev (>= 2.1.0), libsctp-dev, libusb-1.0-0-dev, libmnl-dev, libsystemd-dev, base-files (<< 11) | liburing-dev, python3:native
 Package-List:
  libosmocodec-doc deb doc optional arch=all
  libosmocodec0 deb libs optional arch=any
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty9 deb libs optional arch=any
 Checksums-Sha1:
- d62c1c94a0a277a7bfa3ef39891ae2cf776ebaa8 1064912 libosmocore_1.8.0.234.2b34e.tar.xz
+ 7acab59b5de6435a1b2023ca7700c2ea372715d5 1065108 libosmocore_1.8.0.236.e486.tar.xz
 Checksums-Sha256:
- 32706bc7fb7cb248fdcef7d98a50a67a4322331996c57dc0a729d84e2c2fa269 1064912 libosmocore_1.8.0.234.2b34e.tar.xz
+ c67ccf960a70a3fe48f1943e12a551b1e83d2b4b00da940608000195de1f27cf 1065108 libosmocore_1.8.0.236.e486.tar.xz
 Files:
- 5f529e37b77c228fc2090f7b9b34d63c 1064912 libosmocore_1.8.0.234.2b34e.tar.xz
+ 8cfb5aa09c6bd3b1a2a99d1c76654e34 1065108 libosmocore_1.8.0.236.e486.tar.xz

libosmocore_1.8.0.234.2b34e.tar.xz/.tarball-version -> libosmocore_1.8.0.236.e486.tar.xz/.tarball-version Changed

libosmocore_1.8.0.234.2b34e.tar.xz/debian/changelog -> libosmocore_1.8.0.236.e486.tar.xz/debian/changelog Changed

libosmocore_1.8.0.234.2b34e.tar.xz/debian/control -> libosmocore_1.8.0.236.e486.tar.xz/debian/control Changed

libosmocore_1.8.0.234.2b34e.tar.xz/debian/rules -> libosmocore_1.8.0.236.e486.tar.xz/debian/rules Changed

libosmocore_1.8.0.234.2b34e.tar.xz/src/core/osmo_io.c -> libosmocore_1.8.0.236.e486.tar.xz/src/core/osmo_io.c Changed

@@ -93,17 +93,23 @@
  *  \returns the newly allocated msghdr or NULL in case of error */
 struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg)
 {
-	struct iofd_msghdr *hdr = talloc_zero(iofd, struct iofd_msghdr);
-	if (!hdr)
-		return NULL;
+	bool free_msg = false;
+	struct iofd_msghdr *hdr;
+
 	if (!msg) {
 		msg = iofd_msgb_alloc(iofd);
-		if (!msg) {
-			talloc_free(hdr);
+		if (!msg)
 			return NULL;
-		}
+		free_msg = true;
 	} else {
-		talloc_steal(iofd->msgb_alloc.ctx, msg);
+		talloc_steal(iofd, msg);
+	}
+
+	hdr = talloc_zero(msg, struct iofd_msghdr);
+	if (!hdr) {
+		if (free_msg)
+			talloc_free(msg);
+		return NULL;
 	}
 
 	hdr->action = action;
@@ -129,7 +135,7 @@
 	uint16_t headroom = iofd->msgb_alloc.headroom;
 
 	OSMO_ASSERT(iofd->msgb_alloc.size < 0xffff - headroom);
-	return msgb_alloc_headroom_c(iofd->msgb_alloc.ctx,
+	return msgb_alloc_headroom_c(iofd,
 				     iofd->msgb_alloc.size + headroom, headroom,
 				     iofd->name ? : "iofd_msgb");
 }
@@ -304,6 +310,7 @@
 
 void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr)
 {
+	talloc_steal(iofd->msgb_alloc.ctx, msg);
 	switch (iofd->mode) {
 	case OSMO_IO_FD_MODE_READ_WRITE:
 		iofd_handle_segmented_read(iofd, msg, rc);

Changes of Revision 214