Prechádzať zdrojové kódy

typecheck postMessage data

Typecheck postMessage data so that indexOf() isn't 
called on messages that have Object type and come 
from the same page.
mesteiral 13 rokov pred
rodič
commit
0908f83feb

+ 2 - 2
WebContent/core/scripts/content/wininfo.js

@@ -29,7 +29,7 @@ var wininfo = {};
 	function addListener(onMessage) {
 		function windowMessageListener(event) {
 			var data = event.data;
-			if (data.indexOf(EXT_ID + '::') == 0)
+			if (typeof data === 'string' && data.indexOf(EXT_ID + '::') == 0)
 				onMessage(JSON.parse(data.substr(EXT_ID.length + 2)));
 		}
 		this.addEventListener("message", windowMessageListener, false);
@@ -59,7 +59,7 @@ var wininfo = {};
 			function addListener(onMessage) {
 				function windowMessageListener(event) {
 					var data = event.data;
-					if (data.indexOf(extensionId + '::') == 0)
+					if (typeof data === 'string' && data.indexOf(extensionId + '::') == 0)
 						onMessage(parse(data.substr(extensionId.length + 2)));
 				}
 				top.addEventListener("message", windowMessageListener, false);