Fix "Cannot read property 'y' of null" (#9) (#10)

feross · mafintosh · commit d79fcd026e52 · 2017-02-08T11:44:53.000+01:00
* add failing test for #9 For: #9 * Fix "Cannot read property 'y' of null" (#9) Fixes: #9
diff --git a/index.js b/index.js
@@ -63,7 +63,7 @@ function RPC (opts) {
       return self.emit('warning', e)
     }
 
-    var type = message.y && message.y.toString()
+    var type = message && message.y && message.y.toString()
 
     if (type === 'r' || type === 'e') {
       if (!Buffer.isBuffer(message.t)) return
diff --git a/test.js b/test.js
@@ -1,5 +1,6 @@
 var tape = require('tape')
 var rpc = require('./')
+var dgram = require('dgram')
 
 tape('query + response', function (t) {
   var server = rpc()
@@ -92,3 +93,30 @@ tape('timeout', function (t) {
     t.end()
   })
 })
+
+tape('do not crash on empty string', function (t) {
+  if (/^v0\.10\./.test(process.version)) {
+    // Sending a zero length udp message does not work on Node 0.10
+    t.pass('skipping test on Node 0.10')
+    t.end()
+    return
+  }
+  var server = rpc()
+  var socket = dgram.createSocket('udp4')
+
+  server.on('query', function (query, peer) {
+    t.fail('should not get a query')
+  })
+
+  server.on('warning', function (err) {
+    t.ok(err instanceof Error, 'got expected warning')
+    server.destroy()
+    socket.close()
+    t.end()
+  })
+
+  server.bind(0, function () {
+    var port = server.address().port
+    socket.send('' /* invalid bencoded data */, 0, 0, port, '127.0.0.1')
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ function RPC (opts) {`
`63`	`63`	`return self.emit('warning', e)`
`64`	`64`	`}`
`65`	`65`
`66`		`- var type = message.y && message.y.toString()`
	`66`	`+ var type = message && message.y && message.y.toString()`
`67`	`67`
`68`	`68`	`if (type === 'r' \|\| type === 'e') {`
`69`	`69`	`if (!Buffer.isBuffer(message.t)) return`