Skip to content

Commit aca2548

Browse files
lws-teamlws-team
committed
lgtm: various cleaning
1 parent ebc8e8c commit aca2548

File tree

10 files changed

+44
-44
lines changed

10 files changed

+44
-44
lines changed

‎lib/core/libwebsockets.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,12 +1074,15 @@ lws_tokenize(struct lws_tokenize *ts)
10741074

10751075
if (!utf8 &&
10761076
((ts->flags & LWS_TOKENIZE_F_RFC7230_DELIMS &&
1077-
strchr(rfc7230_delims, c) && c > 32) ||
1078-
((!(ts->flags & LWS_TOKENIZE_F_RFC7230_DELIMS) &&
1079-
(c < '0' || c > '9') && (c < 'A' || c > 'Z') &&
1080-
(c < 'a' || c > 'z') && c != '_') &&
1081-
c != s_minus && c != s_dot && c != s_star && c != s_eq) ||
1082-
c == d_minus || c == d_dot || c == d_star || c == d_eq
1077+
strchr(rfc7230_delims, c) && c > 32) ||
1078+
((!(ts->flags & LWS_TOKENIZE_F_RFC7230_DELIMS) &&
1079+
(c < '0' || c > '9') && (c < 'A' || c > 'Z') &&
1080+
(c < 'a' || c > 'z') && c != '_') &&
1081+
c != s_minus && c != s_dot && c != s_star && c != s_eq) ||
1082+
c == d_minus ||
1083+
c == d_dot ||
1084+
c == d_star ||
1085+
c == d_eq
10831086
) &&
10841087
!((ts->flags & LWS_TOKENIZE_F_COLON_NONTERM) && c == ':') &&
10851088
!((ts->flags & LWS_TOKENIZE_F_SLASH_NONTERM) && c == '/')) {

‎lib/roles/ws/client-ws.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ lws_generate_client_ws_handshake(struct lws *wsi, char *p, const char *conn1, si
161161
{
162162
char buf[128], hash[20], key_b64[40], *end = p + p_len;
163163
size_t s;
164-
int n;
165164
#if !defined(LWS_WITHOUT_EXTENSIONS)
166165
const struct lws_extension *ext;
167166
int ext_count = 0;
@@ -202,7 +201,7 @@ lws_generate_client_ws_handshake(struct lws *wsi, char *p, const char *conn1, si
202201
ext = wsi->a.vhost->ws.extensions;
203202
while (ext && ext->callback) {
204203

205-
n = wsi->a.vhost->protocols[0].callback(wsi,
204+
int n = wsi->a.vhost->protocols[0].callback(wsi,
206205
LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED,
207206
wsi->user_space, (char *)ext->name, 0);
208207

‎minimal-examples-lowlevel/client-server/minimal-ws-proxy/protocol_lws_minimal.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ callback_minimal(struct lws *wsi, enum lws_callback_reasons reason,
107107
vhd = lws_protocol_vh_priv_zalloc(lws_get_vhost(wsi),
108108
lws_get_protocol(wsi),
109109
sizeof(struct per_vhost_data__minimal));
110+
if (!vhd)
111+
return 1;
110112
vhd->context = lws_get_context(wsi);
111113
vhd->protocol = lws_get_protocol(wsi);
112114
vhd->vhost = lws_get_vhost(wsi);

‎minimal-examples-lowlevel/http-server/minimal-http-server-deaddrop/mount-origin/deaddrop.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
{
77
if (!s)
88
return "";
9-
10-
return s.replace(/&/g, "&amp;").
11-
replace(/\</g, "&lt;").
12-
replace(/\>/g, "&gt;").
13-
replace(/\"/g, "&quot;").
14-
replace(/%/g, "&#37;");
9+
return document.createTextNode(s);
1510
}
1611

1712
function lws_urlencode(s)
@@ -37,16 +32,19 @@
3732

3833
function humanize(n)
3934
{
35+
if (typeof n !== 'number')
36+
return "NaN";
37+
4038
if (n < 1024)
41-
return n + "B";
39+
return san(n + "B");
4240

4341
if (n < 1024 * 1024)
44-
return trim((n / 1024).toFixed(2)) + "KiB";
42+
return san(trim((n / 1024).toFixed(2)) + "KiB");
4543

4644
if (n < 1024 * 1024 * 1024)
47-
return trim((n / (1024 * 1024)).toFixed(2)) + "MiB";
45+
return san(trim((n / (1024 * 1024)).toFixed(2)) + "MiB");
4846

49-
return trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB";
47+
return san(trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB");
5048
}
5149

5250
function da_enter(e)
@@ -271,7 +269,7 @@
271269
}
272270
s += "</table>";
273271

274-
t.innerHTML = s;
272+
t.innerHTML = san(s);
275273

276274
for (n = 0; n < j.files.length; n++) {
277275
var d = document.getElementById("d" + n);

‎minimal-examples-lowlevel/http-server/minimal-http-server-eventlib-demos/mount-origin/test.js

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

‎minimal-examples-lowlevel/http-server/minimal-http-server-fulltext-search/mount-origin/lws-fts.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@
2828

2929
function san(s)
3030
{
31-
s.replace(/</g, "!");
32-
s.replace(/%/g, "!");
33-
34-
return s;
31+
if (!s)
32+
return "";
33+
return document.createTextNode(s);
3534
}
3635

3736
function lws_fts_choose()

‎minimal-examples-lowlevel/ws-server/minimal-ws-server-pmd-bulk/mount-origin/example.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
function san(s)
77
{
8-
if (s.search("<") !== -1)
9-
return "invalid string";
10-
11-
return s;
8+
if (!s)
9+
return "";
10+
return document.createTextNode(s);
1211
}
1312

1413

‎minimal-examples-lowlevel/ws-server/minimal-ws-server/protocol_lws_minimal.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ callback_minimal(struct lws *wsi, enum lws_callback_reasons reason,
7676
vhd = lws_protocol_vh_priv_zalloc(lws_get_vhost(wsi),
7777
lws_get_protocol(wsi),
7878
sizeof(struct per_vhost_data__minimal));
79+
if (!vhd)
80+
return 1;
7981
vhd->context = lws_get_context(wsi);
8082
vhd->protocol = lws_get_protocol(wsi);
8183
vhd->vhost = lws_get_vhost(wsi);

‎plugins/deaddrop/assets/deaddrop.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
return "NaN";
4242

4343
if (n < 1024)
44-
return n + "B";
44+
return san(n + "B");
4545

4646
if (n < 1024 * 1024)
47-
return trim((n / 1024).toFixed(2)) + "KiB";
47+
return san(trim((n / 1024).toFixed(2)) + "KiB");
4848

4949
if (n < 1024 * 1024 * 1024)
50-
return trim((n / (1024 * 1024)).toFixed(2)) + "MiB";
50+
return san(trim((n / (1024 * 1024)).toFixed(2)) + "MiB");
5151

52-
return trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB";
52+
return san(trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB");
5353
}
5454

5555
function da_enter(e)

‎test-apps/test.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77

88
function san(s)
99
{
10-
if (s.search("<") !== -1)
11-
return "invalid string";
12-
13-
return s;
10+
return document.createTextNode(s);
1411
}
1512

1613
function check_file()
@@ -366,6 +363,7 @@ var last_x = 0, last_y = 0;
366363
var ctx;
367364
var color = "#000000";
368365
var lm_timer;
366+
var offsetX, offsetY;
369367

370368
function ev_mousemove (ev) {
371369
var x, y;
@@ -426,7 +424,7 @@ function ws_open_mirror()
426424
};
427425

428426
socket_lm.onmessage =function got_packet(msg) {
429-
j = msg.data.split(";");
427+
var j = msg.data.split(";");
430428
var f = 0;
431429
while (f < j.length - 1) {
432430
i = j[f].split(" ");
@@ -471,7 +469,7 @@ function ws_open_mirror()
471469
canvas.addEventListener("mouseup", ev_mouseup, false);
472470

473471
offsetX = offsetY = 0;
474-
element = canvas;
472+
var element = canvas;
475473
if (element.offsetParent) {
476474
do {
477475
offsetX += element.offsetLeft;

0 commit comments

Comments
 (0)