fix: ipfs/js-ipfs#1292 - Catch invalid CIDs and return the error via callback (#170)

Author: mkg20001

benchmarks/index.js

@@ -1,4 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-disable no-console */
 'use strict'
 
 const series = require('async/series')

benchmarks/put-get.js

@@ -1,4 +1,5 @@
 /* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-disable no-console */
 'use strict'
 
 const Benchmark = require('benchmark')

src/types/message/index.js

@@ -148,7 +148,12 @@ BitswapMessage.deserialize = (raw, callback) => {
   if (decoded.wantlist) {
     decoded.wantlist.entries.forEach((entry) => {
       // note: entry.block is the CID here
-      const cid = new CID(entry.block)
+      let cid
+      try {
+        cid = new CID(entry.block)
+      } catch (err) {
+        return callback(err)
+      }
       msg.addEntry(cid, entry.priority, entry.cancel)
     })
   }
@@ -161,7 +166,12 @@ BitswapMessage.deserialize = (raw, callback) => {
         if (err) {
           return cb(err)
         }
-        const cid = new CID(hash)
+        let cid
+        try {
+          cid = new CID(hash)
+        } catch (err) {
+          return callback(err)
+        }
         msg.addBlock(new Block(b, cid))
         cb()
       })
@@ -189,7 +199,12 @@ BitswapMessage.deserialize = (raw, callback) => {
           return cb(err)
         }
 
-        const cid = new CID(cidVersion, codecName[multicodec.toString('16')], hash)
+        let cid
+        try {
+          cid = new CID(cidVersion, codecName[multicodec.toString('16')], hash)
+        } catch (err) {
+          return callback(err)
+        }
 
         msg.addBlock(new Block(p.data, cid))
         cb()

test/benchmarks/get-many.js

@@ -1,5 +1,7 @@
 'use strict'
 
+/* eslint-disable no-console */
+
 const distributionTest = require('../utils/distribution-test')
 const print = require('./helpers/print-swarm-results')
 

test/benchmarks/helpers/print-swarm-results.js

@@ -1,5 +1,7 @@
 'use strict'
 
+/* eslint-disable no-console */
+
 const stats = require('stats-lite')
 
 module.exports = (suite, emitter) => {

test/network/gen-bitswap-network.node.js

@@ -1,5 +1,6 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
+/* eslint-disable no-console */
 'use strict'
 
 const chai = require('chai')

test/swarms.js

@@ -1,6 +1,7 @@
 'use strict'
 
 /* eslint-env mocha */
+/* eslint-disable no-console */
 
 const stats = require('stats-lite')
 const distributionTest = require('./utils/distribution-test')