Osmocom Open Build Service

commit_845002897c50ba3b97f1b5e616cc5e19ef36c792.txt Deleted

commit_89a11fd644dcf9e5741196e4923ec3020c19afd0.txt Added

libosmo-netif_1.5.1.2.84500.dsc Deleted

@@ -1,22 +0,0 @@
-Format: 3.0 (native)
-Source: libosmo-netif
-Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
-Architecture: any all
-Version: 1.5.1.2.84500
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://projects.osmocom.org/projects/libosmo-netif
-Standards-Version: 3.9.6
-Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif
-Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif
-Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libosmocore-dev (>= 1.10.0), pkg-config, libpcap0.8-dev, libsctp-dev
-Package-List:
- libosmo-netif-dbg deb debug extra arch=any
- libosmo-netif-dev deb libdevel optional arch=any
- libosmo-netif-doc deb doc optional arch=all
- libosmonetif11 deb libs optional arch=any
-Checksums-Sha1:
- 9d25d8b62148a76cb8a50b2ac81ef19847158d62 193948 libosmo-netif_1.5.1.2.84500.tar.xz
-Checksums-Sha256:
- 5eef4da0d7d8d41efc0be81d6989a73b74add716bc0d5e9f74522e4bba19cc92 193948 libosmo-netif_1.5.1.2.84500.tar.xz
-Files:
- ee58483f309dcfc4805fd18dff9f5ee6 193948 libosmo-netif_1.5.1.2.84500.tar.xz

libosmo-netif_1.5.1.5.89a1.dsc Added

@@ -0,0 +1,22 @@
+Format: 3.0 (native)
+Source: libosmo-netif
+Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
+Architecture: any all
+Version: 1.5.1.5.89a1
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://projects.osmocom.org/projects/libosmo-netif
+Standards-Version: 3.9.6
+Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif
+Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif
+Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libosmocore-dev (>= 1.10.0), pkg-config, libpcap0.8-dev, libsctp-dev
+Package-List:
+ libosmo-netif-dbg deb debug extra arch=any
+ libosmo-netif-dev deb libdevel optional arch=any
+ libosmo-netif-doc deb doc optional arch=all
+ libosmonetif11 deb libs optional arch=any
+Checksums-Sha1:
+ 46740419d2f1238fbf2a1d4572c4c919145c8e25 194812 libosmo-netif_1.5.1.5.89a1.tar.xz
+Checksums-Sha256:
+ 344b5972ba00a128dacfb72c2c5658d1e25136461934a7348ca1f90cb501c48e 194812 libosmo-netif_1.5.1.5.89a1.tar.xz
+Files:
+ ceefe50e55ba787ceae8264e37172138 194812 libosmo-netif_1.5.1.5.89a1.tar.xz

libosmo-netif_1.5.1.2.84500.tar.xz/.tarball-version -> libosmo-netif_1.5.1.5.89a1.tar.xz/.tarball-version Changed

libosmo-netif_1.5.1.2.84500.tar.xz/debian/changelog -> libosmo-netif_1.5.1.5.89a1.tar.xz/debian/changelog Changed

libosmo-netif_1.5.1.2.84500.tar.xz/src/rtp.c -> libosmo-netif_1.5.1.5.89a1.tar.xz/src/rtp.c Changed

@@ -115,14 +115,21 @@
 	int x_len;
 	int csrc_len;
 
-	csrc_len = rtph->csrc_count << 2;
-	payload = msg->data + sizeof(struct rtp_hdr) + csrc_len;
-	payload_len = msg->len - sizeof(struct rtp_hdr) - csrc_len;
-	if (payload_len < 0) {
-		DEBUGPC(DLMUX, "received RTP frame too short (len = %d, "
-			"csrc count = %d)\n", msg->len, rtph->csrc_count);
+	if (msg->len < sizeof(struct rtp_hdr)) {
+		DEBUGPC(DLMUX, "received RTP frame too short for an RTP header (%d < %zu)\n",
+			msg->len, sizeof(*rtph));
 		return NULL;
 	}
+
+	csrc_len = sizeof(struct rtp_hdr) + (rtph->csrc_count << 2);
+	if (msg->len < csrc_len) {
+		DEBUGPC(DLMUX, "received RTP frame too short for its csrc (%u < %d, csrc_count = %d)\n",
+			msg->len, csrc_len, rtph->csrc_count);
+		return NULL;
+	}
+	payload = msg->data + csrc_len;
+	payload_len = msg->len - csrc_len;
+
 	if (rtph->extension) {
 		if (payload_len < sizeof(struct rtp_x_hdr)) {
 			DEBUGPC(DLMUX, "received RTP frame too short for "
@@ -131,30 +138,31 @@
 		}
 		rtpxh = (struct rtp_x_hdr *)payload;
 		x_len = ntohs(rtpxh->length) * 4 + sizeof(struct rtp_x_hdr);
-		payload += x_len;
-		payload_len -= x_len;
-		if (payload_len < 0) {
+		if (x_len > payload_len) {
 			DEBUGPC(DLMUX, "received RTP frame too short, "
 				"extension header exceeds frame length\n");
 			return NULL;
 		}
+		payload += x_len;
+		payload_len -= x_len;
 	}
 	if (rtph->padding) {
-		if (payload_len < 0) {
+		uint8_t padding_len;
+		if (payload_len < 1) {
 			DEBUGPC(DLMUX, "received RTP frame too short for "
 				"padding length\n");
 			return NULL;
 		}
-		payload_len -= payloadpayload_len - 1;
-		if (payload_len < 0) {
-			DEBUGPC(DLMUX, "received RTP frame with padding "
-				"greater than payload\n");
+		padding_len = payloadpayload_len - 1;
+		if (payload_len < padding_len) {
+			DEBUGPC(DLMUX, "received RTP frame with padding greater than payload\n");
 			return NULL;
 		}
+		payload_len -= padding_len;
 	}
 
 	*plen = payload_len;
-	return (uint8_t *)msg->data + msg->len - payload_len;
+	return payload;
 }
 
 struct msgb *

Changes of Revision 109