summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMark Thomas <markt@apache.org>2020-06-29 15:08:25 +0100
committerAndrew Clayton <a.clayton@nginx.com>2025-02-21 22:40:00 +0000
commit5e7bc383f60e7567def0dc25c9ced44bbf60d550 (patch)
tree88683744daa7f1e63293396936f2f0aaefe84d0e /src
parent3fea47eaa3edd916ecf0b339626dd5f963838295 (diff)
downloadunit-5e7bc383f60e7567def0dc25c9ced44bbf60d550.tar.gz
unit-5e7bc383f60e7567def0dc25c9ced44bbf60d550.tar.bz2
java: websocket: Fix calculation of payload length for > 32bit values
Patch taken from <https://github.com/apache/tomcat/commit/1cddae8da4ecb4ac04575d3b5fba2daa2e0c8ead.patch> [ Subject / message tweak - Andrew ] Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Diffstat (limited to 'src')
-rw-r--r--src/java/nginx/unit/websocket/WsFrameBase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/nginx/unit/websocket/WsFrameBase.java b/src/java/nginx/unit/websocket/WsFrameBase.java
index 06d20bf4..2057ff3f 100644
--- a/src/java/nginx/unit/websocket/WsFrameBase.java
+++ b/src/java/nginx/unit/websocket/WsFrameBase.java
@@ -670,7 +670,7 @@ public abstract class WsFrameBase {
int shift = 0;
long result = 0;
for (int i = start + len - 1; i >= start; i--) {
- result = result + ((b[i] & 0xFF) << shift);
+ result = result + ((b[i] & 0xFFL) << shift);
shift += 8;
}
return result;