1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coverity fixes: src/node_net

Browse Source
This commit is contained in:
Peter Griess 2010-07-12 08:48:33 -07:00 committed by Ryan Dahl
parent 760fb17bbf
commit 6eb0b6ac27
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node_net.cc
View File

@ -35,6 +35,8 @@
#include <sys/uio.h> #include <sys/uio.h>
#endif #endif
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
namespace node { namespace node {
@ -61,8 +63,6 @@ static Persistent<FunctionTemplate> recv_msg_template;
String::New("Bad file descriptor argument"))); \ String::New("Bad file descriptor argument"))); \
} }
static inline bool SetCloseOnExec(int fd) { static inline bool SetCloseOnExec(int fd) {
return (fcntl(fd, F_SETFD, FD_CLOEXEC) != -1); return (fcntl(fd, F_SETFD, FD_CLOEXEC) != -1);
} }
@ -197,13 +197,13 @@ static inline Handle<Value> ParseAddressArgs(Handle<Value> first,
// UNIX // UNIX
String::Utf8Value path(first->ToString()); String::Utf8Value path(first->ToString());
if (path.length() > sizeof un.sun_path) { if (path.length() >= ARRAY_SIZE(un.sun_path)) {
return Exception::Error(String::New("Socket path too long")); return Exception::Error(String::New("Socket path too long"));
} }
memset(&un, 0, sizeof un);
un.sun_family = AF_UNIX; un.sun_family = AF_UNIX;
strcpy(un.sun_path, *path); strncpy(un.sun_path, *path, ARRAY_SIZE(un.sun_path) - 1);
un.sun_path[ARRAY_SIZE(un.sun_path) - 1] = '\0';
addr = (struct sockaddr*)&un; addr = (struct sockaddr*)&un;
addrlen = path.length() + sizeof(un.sun_family) + 1; addrlen = path.length() + sizeof(un.sun_family) + 1;
@ -628,6 +628,7 @@ static Handle<Value> RecvMsg(const Arguments& args) {
iov[0].iov_len = len; iov[0].iov_len = len;
struct msghdr msg; struct msghdr msg;
msg.msg_flags = 0;
msg.msg_iov = iov; msg.msg_iov = iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
msg.msg_name = NULL; msg.msg_name = NULL;