Skip to content
This repository has been archived by the owner on Aug 20, 2018. It is now read-only.

Bug 793764 - Decode addons too to not operate on a string. r=jhammel #104

Merged
merged 1 commit into from
Oct 2, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mozmill/mozmill/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@ def get_appinfo(self, bridge):
try:
mozmill = jsbridge.JSObject(bridge, js_module_mozmill)
app_info = json.loads(mozmill.getApplicationDetails())

# Bug 793764: The addons object is encoded twice so json.loads()
# has to be called once more on it.
app_info['addons'] = json.loads(app_info['addons'])
except JSBridgeDisconnectError:
# We don't have to call report_disconnect here because
# start_runner() will handle this exception
Expand Down
2 changes: 2 additions & 0 deletions mozmill/mozmill/extension/resource/driver/mozmill.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ if (typeof AddonManager != "undefined") {
return value;
}

// Bug 793764: Extra encode add-on details to circumvent
// an unicode issue with JSBridge
addons = converter.ConvertToUnicode(JSON.stringify(addonList, replacer));
});
}
Expand Down