summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-08-15 09:52:38 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-08-15 09:52:38 +0200
commit8c34d786e46adbcf5496549cb3fe1898761632d4 (patch)
tree18ffb14b6e8c9e6889474aa54c13fe9ce7b2a330 /services
parent9d833d769a064d6b0d18813ab03adc2ff2139615 (diff)
downloaduxp-8c34d786e46adbcf5496549cb3fe1898761632d4.tar.gz
Issue #1208: Fix jsonLoad in Sync's `util.js` to handle errors.
- `OS.Path.join` can throw, so we always need to try/catch it. - Also do a sanity check to make sure `callback` is defined before use
Diffstat (limited to 'services')
-rw-r--r--services/sync/modules/util.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 7fd5a79716..73f4d8a801 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -321,10 +321,17 @@ this.Utils = {
* could not be loaded, the first argument will be undefined.
*/
jsonLoad: Task.async(function*(filePath, that, callback) {
- let path = OS.Path.join(OS.Constants.Path.profileDir, "weave", filePath + ".json");
+ let path;
+ try {
+ path = OS.Path.normalize(OS.Path.join(OS.Constants.Path.profileDir, "weave", filePath + ".json"));
+ } catch (e) {
+ if (that._log) {
+ that._log.debug("Path join error: " + e);
+ }
+ }
if (that._log) {
- that._log.trace("Loading json from disk: " + filePath);
+ that._log.trace("Loading json from disk: " + path);
}
let json;
@@ -341,8 +348,9 @@ this.Utils = {
}
}
}
-
- callback.call(that, json);
+ if (callback) {
+ callback.call(that, json);
+ }
}),
/**