lgtm: various cleaning

Author: lws-team

lib/core/libwebsockets.c

@@ -1074,12 +1074,15 @@ lws_tokenize(struct lws_tokenize *ts)
 
 		if (!utf8 &&
 		     ((ts->flags & LWS_TOKENIZE_F_RFC7230_DELIMS &&
-		     strchr(rfc7230_delims, c) && c > 32) ||
-		    ((!(ts->flags & LWS_TOKENIZE_F_RFC7230_DELIMS) &&
-		     (c < '0' || c > '9') && (c < 'A' || c > 'Z') &&
-		     (c < 'a' || c > 'z') && c != '_') &&
-		     c != s_minus && c != s_dot && c != s_star && c != s_eq) ||
-		    c == d_minus || c == d_dot || c == d_star || c == d_eq
+		       strchr(rfc7230_delims, c) && c > 32) ||
+		       ((!(ts->flags & LWS_TOKENIZE_F_RFC7230_DELIMS) &&
+		        (c < '0' || c > '9') && (c < 'A' || c > 'Z') &&
+		        (c < 'a' || c > 'z') && c != '_') &&
+		        c != s_minus && c != s_dot && c != s_star && c != s_eq) ||
+		        c == d_minus ||
+			c == d_dot ||
+			c == d_star ||
+			c == d_eq
 		    ) &&
 		    !((ts->flags & LWS_TOKENIZE_F_COLON_NONTERM) && c == ':') &&
 		    !((ts->flags & LWS_TOKENIZE_F_SLASH_NONTERM) && c == '/')) {

lib/roles/ws/client-ws.c

@@ -161,7 +161,6 @@ lws_generate_client_ws_handshake(struct lws *wsi, char *p, const char *conn1, si
 {
 	char buf[128], hash[20], key_b64[40], *end = p + p_len;
 	size_t s;
-	int n;
 #if !defined(LWS_WITHOUT_EXTENSIONS)
 	const struct lws_extension *ext;
 	int ext_count = 0;
@@ -202,7 +201,7 @@ lws_generate_client_ws_handshake(struct lws *wsi, char *p, const char *conn1, si
 	ext = wsi->a.vhost->ws.extensions;
 	while (ext && ext->callback) {
 
-		n = wsi->a.vhost->protocols[0].callback(wsi,
+		int n = wsi->a.vhost->protocols[0].callback(wsi,
 			LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED,
 				wsi->user_space, (char *)ext->name, 0);
 

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

@@ -107,6 +107,8 @@ callback_minimal(struct lws *wsi, enum lws_callback_reasons reason,
 		vhd = lws_protocol_vh_priv_zalloc(lws_get_vhost(wsi),
 				lws_get_protocol(wsi),
 				sizeof(struct per_vhost_data__minimal));
+		if (!vhd)
+			return 1;
 		vhd->context = lws_get_context(wsi);
 		vhd->protocol = lws_get_protocol(wsi);
 		vhd->vhost = lws_get_vhost(wsi);

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

@@ -6,12 +6,7 @@
 	{
 		if (!s)
 			return "";
-
-		return s.replace(/&/g, "&").
-		replace(/\</g, "&lt;").
-		replace(/\>/g, "&gt;").
-		replace(/\"/g, "&quot;").
-		replace(/%/g, "&#37;");
+		return document.createTextNode(s);
 	}
 
 	function lws_urlencode(s)
@@ -37,16 +32,19 @@
 
 	function humanize(n)
 	{
+		if (typeof n !== 'number')
+			return "NaN";
+
 		if (n < 1024)
-			return n + "B";
+			return san(n + "B");
 
 		if (n < 1024 * 1024)
-			return trim((n / 1024).toFixed(2)) + "KiB";
+			return san(trim((n / 1024).toFixed(2)) + "KiB");
 
 		if (n < 1024 * 1024 * 1024)
-			return trim((n / (1024 * 1024)).toFixed(2)) + "MiB";
+			return san(trim((n / (1024 * 1024)).toFixed(2)) + "MiB");
 
-		return trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB";
+		return san(trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB");
 	}
 
 	function da_enter(e)
@@ -104,7 +102,7 @@
 		c2.innerHTML = humanize(file.size);
 
 		c3.classList.add("ogn");
-		c3.innerHTML = file.name;
+		c3.innerHTML = san(file.name);
 
 		if (file.size > server_max_size)
 			return;
@@ -271,7 +269,7 @@
 				}
 				s += "</table>";
 
-				t.innerHTML = s;
+				t.innerHTML = san(s);
 
 				for (n = 0; n < j.files.length; n++) {
 					var d = document.getElementById("d" + n);

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

@@ -28,10 +28,9 @@
 
 	function san(s)
 	{
-		s.replace(/</g, "!");
-		s.replace(/%/g, "!");
-		
-		return s;
+		if (!s)
+			return "";
+		return document.createTextNode(s);
 	}
 
 	function lws_fts_choose()

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

@@ -5,10 +5,9 @@
 
 function san(s)
 {
-	if (s.search("<") !== -1)
-		return "invalid string";
-	
-	return s;
+	if (!s)
+		return "";
+	return document.createTextNode(s);
 }
 
 

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

@@ -76,6 +76,8 @@ callback_minimal(struct lws *wsi, enum lws_callback_reasons reason,
 		vhd = lws_protocol_vh_priv_zalloc(lws_get_vhost(wsi),
 				lws_get_protocol(wsi),
 				sizeof(struct per_vhost_data__minimal));
+		if (!vhd)
+			return 1;
 		vhd->context = lws_get_context(wsi);
 		vhd->protocol = lws_get_protocol(wsi);
 		vhd->vhost = lws_get_vhost(wsi);

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

@@ -41,15 +41,15 @@
 			return "NaN";
 
 		if (n < 1024)
-			return n + "B";
+			return san(n + "B");
 
 		if (n < 1024 * 1024)
-			return trim((n / 1024).toFixed(2)) + "KiB";
+			return san(trim((n / 1024).toFixed(2)) + "KiB");
 
 		if (n < 1024 * 1024 * 1024)
-			return trim((n / (1024 * 1024)).toFixed(2)) + "MiB";
+			return san(trim((n / (1024 * 1024)).toFixed(2)) + "MiB");
 
-		return trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB";
+		return san(trim((n / (1024 * 1024 * 1024)).toFixed(2)) + "GiB");
 	}
 
 	function da_enter(e)

plugins/deaddrop/assets/deaddrop.js

@@ -7,10 +7,7 @@
 
 function san(s)
 {
-	if (s.search("<") !== -1)
-		return "invalid string";
-	
-	return s;
+	return document.createTextNode(s);
 }
 
 function check_file()
@@ -366,6 +363,7 @@ var last_x = 0, last_y = 0;
 var ctx;
 var color = "#000000";
 var lm_timer;
+var offsetX, offsetY;
 
 function ev_mousemove (ev) {
 	var x, y;
@@ -426,7 +424,7 @@ function ws_open_mirror()
 		};
 
 		socket_lm.onmessage =function got_packet(msg) {
-			j = msg.data.split(";");
+			var j = msg.data.split(";");
 			var f = 0;
 			while (f < j.length - 1) {
 				i = j[f].split(" ");
@@ -471,7 +469,7 @@ function ws_open_mirror()
 	canvas.addEventListener("mouseup", ev_mouseup, false);
 
 	offsetX = offsetY = 0;
-	element = canvas;
+	var element = canvas;
       if (element.offsetParent) {
         do {
           offsetX += element.offsetLeft;