Merge pull request #165 from loulin/master

longbai · longbai · commit 1fc566df4034 · 2016-03-10T23:00:04.000+08:00
fix Cannot read property 'error' of null
diff --git a/qiniu/rpc.js b/qiniu/rpc.js
@@ -52,7 +52,7 @@ function post(uri, form, headers, onresp) {
   var req = urllib.request(uri, data, function(err, result, res) {
     var rerr = null;
     if (err || Math.floor(res.statusCode/100) !== 2) {
-      rerr = {code: res&&res.statusCode||-1, error: err||result.error||''};
+      rerr = {code: res&&res.statusCode||-1, error: err||result&&result.error||''};
     }
     onresp(rerr, result, res);
   });

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ function post(uri, form, headers, onresp) {`
`52`	`52`	`var req = urllib.request(uri, data, function(err, result, res) {`
`53`	`53`	`var rerr = null;`
`54`	`54`	`if (err \|\| Math.floor(res.statusCode/100) !== 2) {`
`55`		`- rerr = {code: res&&res.statusCode\|\|-1, error: err\|\|result.error\|\|''};`
	`55`	`+ rerr = {code: res&&res.statusCode\|\|-1, error: err\|\|result&&result.error\|\|''};`
`56`	`56`	`}`
`57`	`57`	`onresp(rerr, result, res);`
`58`	`58`	`});`