From f3f6587f0b44b959e53223e48d859fe1e6eb8a94 Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Tue, 3 Jun 2014 19:13:52 +0200
Subject: [PATCH] Fix bug in RTCP packet length computation.
---
.../jitsi/impl/neomedia/transform/rtcp/StatisticsEngine.java | 5 +++--
.../impl/neomedia/transform/zrtp/SecurityEventManager.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/transform/rtcp/StatisticsEngine.java b/src/org/jitsi/impl/neomedia/transform/rtcp/StatisticsEngine.java
index 06982415..12843ccb 100644
--- a/src/org/jitsi/impl/neomedia/transform/rtcp/StatisticsEngine.java
+++ b/src/org/jitsi/impl/neomedia/transform/rtcp/StatisticsEngine.java
@@ -61,9 +61,10 @@ private static boolean isRTCP(RawPacket pkt)
if (v == RTCPHeader.VERSION)
{
- int length = (buf[off + 2] << 8) + (buf[off + 3] << 0);
+ int lengthInWords = (buf[off + 2] << 8) + (buf[off + 3] << 0);
+ int lengthInBytes = (lengthInWords + 1) * 4;
- if (length <= len)
+ if (lengthInBytes <= len)
b = true;
}
}
diff --git a/src/org/jitsi/impl/neomedia/transform/zrtp/SecurityEventManager.java b/src/org/jitsi/impl/neomedia/transform/zrtp/SecurityEventManager.java
index 09519974..fec3fa66 100644
--- a/src/org/jitsi/impl/neomedia/transform/zrtp/SecurityEventManager.java
+++ b/src/org/jitsi/impl/neomedia/transform/zrtp/SecurityEventManager.java
@@ -101,7 +101,7 @@ public SecurityEventManager(ZrtpControlImpl zrtpControl)
/**
* Set the type of this session.
*
- * @param type the <tt>MediaType</tt> of this session
+ * @param sessionType the <tt>MediaType</tt> of this session
*/
public void setSessionType(MediaType sessionType)
{
--
GitLab