Skip to content

Commit

Permalink
net: fix usage of writeBuffer in makeSyncWrite
Browse files Browse the repository at this point in the history
The binding writeBuffer has been changed in
nodejs#19041 and it now requires
the last argument to be a context object. makeSyncWrite
was not updated accordingly, resulting assertions on Windows.
This patch fixes the usage of writeBuffer there.

Also fix errors.uvException() so error.message are no longer
enumerable, this fixes the deepStrictEqual assertion on the
error object in test-stdout-close-catch.

PR-URL: nodejs#19103
Refs: nodejs#19041
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
joyeecheung authored and MayaLekova committed May 8, 2018
1 parent 31a8c54 commit 9759dd0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
29 changes: 19 additions & 10 deletions lib/internal/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,23 @@ function message(key, args) {
* @returns {Error}
*/
function uvException(ctx) {
const err = new Error();
const [ code, uvmsg ] = errmap.get(ctx.errno);
let message = `${code}: ${uvmsg}, ${ctx.syscall}`;

let path;
let dest;
if (ctx.path) {
path = ctx.path.toString();
message += ` '${path}'`;
}
if (ctx.dest) {
dest = ctx.dest.toString();
message += ` -> '${dest}'`;
}

// Pass the message to the constructor instead of setting it on the object
// to make sure it is the same as the one created in C++
const err = new Error(message);

for (const prop of Object.keys(ctx)) {
if (prop === 'message' || prop === 'path' || prop === 'dest') {
Expand All @@ -435,20 +451,13 @@ function uvException(ctx) {
err[prop] = ctx[prop];
}

const [ code, uvmsg ] = errmap.get(ctx.errno);
err.code = code;
let message = `${code}: ${uvmsg}, ${ctx.syscall}`;
if (ctx.path) {
const path = ctx.path.toString();
message += ` '${path}'`;
if (path) {
err.path = path;
}
if (ctx.dest) {
const dest = ctx.dest.toString();
message += ` -> '${dest}'`;
if (dest) {
err.dest = dest;
}
err.message = message;

Error.captureStackTrace(err, uvException);
return err;
Expand Down
11 changes: 6 additions & 5 deletions lib/internal/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const Buffer = require('buffer').Buffer;
const { isIPv6 } = process.binding('cares_wrap');
const { writeBuffer } = process.binding('fs');
const errors = require('internal/errors');

const octet = '(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
const re = new RegExp(`^${octet}[.]${octet}[.]${octet}[.]${octet}$`);
Expand Down Expand Up @@ -33,13 +34,13 @@ function makeSyncWrite(fd) {

this._bytesDispatched += chunk.length;

try {
writeBuffer(fd, chunk, 0, chunk.length, null);
} catch (ex) {
const ctx = {};
writeBuffer(fd, chunk, 0, chunk.length, null, undefined, ctx);
if (ctx.errno !== undefined) {
const ex = errors.uvException(ctx);
// Legacy: net writes have .code === .errno, whereas writeBuffer gives the
// raw errno number in .errno.
if (typeof ex.code === 'string')
ex.errno = ex.code;
ex.errno = ex.code;
return cb(ex);
}
cb();
Expand Down

0 comments on commit 9759dd0

Please sign in to comment.