Skip to content

fs: fix handling of struct stat fields #8515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 2 commits into from
Closed

fs: fix handling of struct stat fields #8515

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ccbf1
fs: fix handling of `uv_stat_t` fields
addaleax Sep 13, 2016
7f3eeb4
[squash] undo accidental change to other fields of uv_fs_stat
addaleax Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fs: fix handling of uv_stat_t fields 
`FChown` and `Chown` test that the `uid` and `gid` parameters
they receive are unsigned integers, but `Stat()` and `FStat()`
would return the corresponding fields of `uv_stat_t` as signed
integers. Applications which pass those these values directly
to `Chown` may fail
(e.g. for `nobody` on OS X, who has an `uid` of `-2`, see e.g.
nodejs/node-v0.x-archive#5890).

This patch changes the `Integer::New()` call for `uid` and `gid`
to `Integer::NewFromUnsigned()`.

All other fields are kept as they are, for performance, but
strictly speaking the respective sizes of those
fields aren’t specified, either.

Ref: npm/npm#13918
  • Loading branch information
@addaleax
addaleax committed Sep 13, 2016
commit 28ccbf1fbe47ba9d7647f59d35b262cb1f4f60b1
30 changes: 20 additions & 10 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,34 +433,44 @@ Local<Value> BuildStatsObject(Environment* env, const uv_stat_t* s) {
// crash();
// }
//
// We need to check the return value of Integer::New() and Date::New()
// We need to check the return value of Number::New() and Date::New()
// and make sure that we bail out when V8 returns an empty handle.

// Integers.
// Unsigned integers. It does not actually seem to be specified whether
// uid and gid are unsigned or not, but in practice they are unsigned,
// and Node’s (F)Chown functions do check their arguments for unsignedness.
#define X(name) \
Local<Value> name = Integer::New(env->isolate(), s->st_##name); \
Local<Value> name = Integer::NewFromUnsigned(env->isolate(), s->st_##name); \
if (name.IsEmpty()) \
return handle_scope.Escape(Local<Object>()); \
return Local<Object>(); \

X(dev)
X(mode)
X(nlink)
X(uid)
X(gid)
X(rdev)
# if defined(__POSIX__)
X(blksize)
# else
Local<Value> blksize = Undefined(env->isolate());
# endif
#undef X

// Integers.
#define X(name) \
Local<Value> name = Integer::NewFromUnsigned(env->isolate(), s->st_##name); \
Copy link
Contributor

@thefourtheye thefourtheye Sep 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This must be Integer::New, right?

Copy link
Member Author

@addaleax addaleax Sep 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

… yeah, sorry.

if (name.IsEmpty()) \
return Local<Object>(); \

X(dev)
X(mode)
X(nlink)
X(rdev)
#undef X

// Numbers.
#define X(name) \
Local<Value> name = Number::New(env->isolate(), \
static_cast<double>(s->st_##name)); \
if (name.IsEmpty()) \
return handle_scope.Escape(Local<Object>()); \
return Local<Object>(); \

X(ino)
X(size)
Expand All @@ -479,7 +489,7 @@ Local<Value> BuildStatsObject(Environment* env, const uv_stat_t* s) {
(static_cast<double>(s->st_##name.tv_nsec / 1000000))); \
\
if (name##_msec.IsEmpty()) \
return handle_scope.Escape(Local<Object>()); \
return Local<Object>(); \

X(atim)
X(mtim)
Expand Down