Bug 738298 - navigator.mozApps.mgmt.getAll() doesn't handle non-ASCII characters in the manifest [r=vingtetun]

This commit is contained in:
Fabrice Desré 2012-07-31 03:06:56 -07:00
parent 6448c724cf
commit 69048397f1

View File

@ -180,8 +180,13 @@ let DOMApplicationRegistry = {
// Read json file into a string
let data = null;
try {
data = JSON.parse(NetUtil.readInputStreamToString(aStream,
aStream.available()) || "");
// Obtain a converter to read from a UTF-8 encoded input stream.
let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
.createInstance(Ci.nsIScriptableUnicodeConverter);
converter.charset = "UTF-8";
data = JSON.parse(converter.ConvertToUnicode(NetUtil.readInputStreamToString(aStream,
aStream.available()) || ""));
aStream.close();
if (aCallback)
aCallback(data);