From 54bd1c96837756164cb59d506e76a7e5ff9a76d1 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 19 Dec 2014 20:56:12 +0000
Subject: [PATCH] res_http_websocket.c: Fix incorrect use of sizeof in
ast_websocket_write().
This won't fix the reported issue but it is an incorrect use of sizeof.
ASTERISK-24566
Reported by: Badalian Vyacheslav
........
Merged revisions 429867 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 429868 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/res_http_websocket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index 400e5eb1c2..4930bcc42b 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -273,7 +273,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_write)(struct ast_websocket *session, en
{
size_t header_size = 2; /* The minimum size of a websocket frame is 2 bytes */
char *frame;
- uint64_t length = 0;
+ uint64_t length;
if (actual_length < 126) {
length = actual_length;
@@ -288,7 +288,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_write)(struct ast_websocket *session, en
}
frame = ast_alloca(header_size);
- memset(frame, 0, sizeof(*frame));
+ memset(frame, 0, header_size);
frame[0] = opcode | 0x80;
frame[1] = length;
--
GitLab