Merge pull request #3174 from nrotta/master

Fixes #3155 - Calling reply without a payload on a JSONP route throws

Author: hueniverse

lib/response.js

@@ -622,6 +622,6 @@ internals.Payload.prototype.jsonp = function (variable) {
 
     this._sizeOffset = this._sizeOffset + variable.length + 7;
     this._prefix = '/**/' + variable + '(';                 // '/**/' prefix prevents CVE-2014-4671 security exploit
-    this._data = Buffer.isBuffer(this._data) ? this._data : this._data.replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029');
+    this._data = (this._data === null || Buffer.isBuffer(this._data)) ? this._data : this._data.replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029');
     this._suffix = ');';
 };

test/transmit.js

@@ -390,6 +390,26 @@ describe('transmission', () => {
             });
         });
 
+        it('returns an JSONP response with no payload', (done) => {
+
+            const handler = function (request, reply) {
+
+                return reply();
+            };
+
+            const server = new Hapi.Server();
+            server.connection();
+            server.route({ method: 'GET', path: '/', config: { jsonp: 'callback', handler: handler } });
+
+            server.inject('/?callback=me', (res) => {
+
+                expect(res.payload).to.equal('/**/me();');
+                expect(res.headers['content-length']).to.equal(9);
+                expect(res.headers['content-type']).to.equal('text/javascript; charset=utf-8');
+                done();
+            });
+        });
+
         it('returns an JSONP response (no charset)', (done) => {
 
             const handler = function (request, reply) {