daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coverity fixes: src/node.cc

v0.7.4-release
Peter Griess 2010-07-12 08:47:45 -07:00 committed by Ryan Dahl
parent c8dba94ff6
commit 4e3c5d88b3
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/node.cc
View File

@ -45,6 +45,8 @@
#include <v8-debug.h> #include <v8-debug.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
using namespace v8; using namespace v8;
extern char **environ; extern char **environ;
@ -94,9 +96,9 @@ static ev_async eio_want_poll_notifier;
static ev_async eio_done_poll_notifier; static ev_async eio_done_poll_notifier;
static ev_idle eio_poller; static ev_idle eio_poller;
// Buffer for getpwnam_r(), getgrpam_r(); keep this scoped at file-level rather // Buffer for getpwnam_r(), getgrpam_r() and other misc callers; keep this
// than method-level to avoid excess stack usage. // scoped at file-level rather than method-level to avoid excess stack usage.
static char getbuf[1024]; static char getbuf[PATH_MAX + 1];
// We need to notify V8 when we're idle so that it can run the garbage // We need to notify V8 when we're idle so that it can run the garbage
// collector. The interface to this is V8::IdleNotification(). It returns // collector. The interface to this is V8::IdleNotification(). It returns
@ -1114,12 +1116,13 @@ static Handle<Value> Cwd(const Arguments& args) {
HandleScope scope; HandleScope scope;
assert(args.Length() == 0); assert(args.Length() == 0);
char output[PATH_MAX]; char *r = getcwd(getbuf, ARRAY_SIZE(getbuf) - 1);
char *r = getcwd(output, PATH_MAX);
if (r == NULL) { if (r == NULL) {
return ThrowException(Exception::Error(String::New(strerror(errno)))); return ThrowException(Exception::Error(String::New(strerror(errno))));
} }
Local<String> cwd = String::New(output);
getbuf[ARRAY_SIZE(getbuf) - 1] = '\0';
Local<String> cwd = String::New(r);
return scope.Close(cwd); return scope.Close(cwd);
} }
@ -1174,7 +1177,7 @@ static Handle<Value> SetGid(const Arguments& args) {
struct group grp, *grpp = NULL; struct group grp, *grpp = NULL;
int err; int err;
if ((err = getgrnam_r(*grpnam, &grp, getbuf, sizeof(getbuf), &grpp)) || if ((err = getgrnam_r(*grpnam, &grp, getbuf, ARRAY_SIZE(getbuf), &grpp)) ||
grpp == NULL) { grpp == NULL) {
return ThrowException(ErrnoException(errno, "getgrnam_r")); return ThrowException(ErrnoException(errno, "getgrnam_r"));
} }
@ -1209,7 +1212,7 @@ static Handle<Value> SetUid(const Arguments& args) {
struct passwd pwd, *pwdp = NULL; struct passwd pwd, *pwdp = NULL;
int err; int err;
if ((err = getpwnam_r(*pwnam, &pwd, getbuf, sizeof(getbuf), &pwdp)) || if ((err = getpwnam_r(*pwnam, &pwd, getbuf, ARRAY_SIZE(getbuf), &pwdp)) ||
pwdp == NULL) { pwdp == NULL) {
return ThrowException(ErrnoException(errno, "getpwnam_r")); return ThrowException(ErrnoException(errno, "getpwnam_r"));
} }
@ -1358,6 +1361,7 @@ Handle<Value> DLOpen(const v8::Arguments& args) {
void *init_handle = dlsym(handle, "init"); void *init_handle = dlsym(handle, "init");
// Error out if not found. // Error out if not found.
if (init_handle == NULL) { if (init_handle == NULL) {
dlclose(handle);
Local<Value> exception = Local<Value> exception =
Exception::Error(String::New("No 'init' symbol found in module.")); Exception::Error(String::New("No 'init' symbol found in module."));
return ThrowException(exception); return ThrowException(exception);
@ -1367,6 +1371,8 @@ Handle<Value> DLOpen(const v8::Arguments& args) {
// Execute the C++ module // Execute the C++ module
init(target); init(target);
// Tell coverity that 'handle' should not be freed when we return.
// coverity[leaked_storage]
return Undefined(); return Undefined();
} }

4
src/node_net.cc
View File

@ -1142,7 +1142,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) {
Local<Function> cb = Local<Function>::Cast(args[2]); Local<Function> cb = Local<Function>::Cast(args[2]);
struct resolve_request *rreq = (struct resolve_request *) struct resolve_request *rreq = (struct resolve_request *)
calloc(1, sizeof(struct resolve_request) + hostname.length()); calloc(1, sizeof(struct resolve_request) + hostname.length() + 1);
if (!rreq) { if (!rreq) {
V8::LowMemoryNotification(); V8::LowMemoryNotification();
@ -1150,7 +1150,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) {
String::New("Could not allocate enough memory"))); String::New("Could not allocate enough memory")));
} }
strcpy(rreq->hostname, *hostname); strncpy(rreq->hostname, *hostname, hostname.length() + 1);
rreq->cb = Persistent<Function>::New(cb); rreq->cb = Persistent<Function>::New(cb);
rreq->ai_family = fam; rreq->ai_family = fam;