Skip to content

Commit a83436f

Browse files
committed
Replace new Function() with JSON.parse()
1 parent 0e4732c commit a83436f

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/gmail.js

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -891,10 +891,8 @@ var Gmail_ = function(localJQuery) {
891891
endIndex = (parseInt(dataLength, 10) - 2) + response.indexOf("[");
892892
data = response.substring(response.indexOf("["), endIndex);
893893

894-
var get_data = new Function("\"use strict\"; return " + data);
895-
realData = get_data();
896-
897-
parsedResponse.push(realData);
894+
var json = JSON.parse(data);
895+
parsedResponse.push(json);
898896

899897
// prepare response for next loop
900898
response = response.substring(response.indexOf("["), response.length);
@@ -1684,11 +1682,9 @@ var Gmail_ = function(localJQuery) {
16841682
return emails;
16851683
}
16861684

1687-
get_data = get_data.substring(get_data.indexOf("["), get_data.length);
1688-
get_data = "\"use strict\"; return " + get_data;
1689-
get_data = new Function(get_data);
1690-
1691-
api.tracker.view_data = get_data();
1685+
var data = get_data.substring(get_data.indexOf("["), get_data.length);
1686+
var json = JSON.parse(data);
1687+
api.tracker.view_data = json;
16921688

16931689
for(var i in api.tracker.view_data) {
16941690
if (typeof(api.tracker.view_data[i]) === "function") {
@@ -1934,13 +1930,10 @@ var Gmail_ = function(localJQuery) {
19341930
if (!get_data) {
19351931
return {};
19361932
}
1937-
get_data = get_data.substring(get_data.indexOf("["), get_data.length);
1938-
get_data = "\"use strict\"; return " + get_data;
1939-
get_data = new Function(get_data);
1940-
1941-
var cdata = get_data();
1933+
var data = get_data.substring(get_data.indexOf("["), get_data.length);
1934+
var json = JSON.parse(data);
19421935

1943-
api.tracker.email_data = cdata[0];
1936+
api.tracker.email_data = json[0];
19441937
return api.tools.parse_email_data(api.tracker.email_data);
19451938
};
19461939

0 commit comments

Comments
 (0)