Skip to content

Various data type and memory fixes for Linux #2

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

Merged
jhead merged 2 commits into from
May 4, 2017
Merged

Various data type and memory fixes for Linux #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb6eb27
Memory fixes for #1
jhead May 3, 2017
7d99f3d
Additional fixes for #1
jhead May 4, 2017
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
20 changes: 13 additions & 7 deletions src/functions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ using Nan::Null;
#ifndef linux
struct msgbuf {
long mtype;
char mtext[MSGMAX - 4];
char mtext[1];
};
#endif

const size_t bsize = sizeof(struct msgbuf);

const char *ConcatString(std::string one, const char *two) {
return one.append(two).c_str();
}
Expand All @@ -43,13 +45,16 @@ class SendMessageWorker : public AsyncWorker {
~SendMessageWorker() { }

void Execute() {
msgbuf *message = new msgbuf;
message->mtype = type;
struct msgbuf* message =
(struct msgbuf*)malloc(bsize + dataLength);

message->mtype = type;
memcpy(message->mtext, data, dataLength);

ret = msgsnd(id, message, dataLength, flags);
error = errno;

free(message);
}

void HandleOKCallback () {
Expand All @@ -65,7 +70,7 @@ class SendMessageWorker : public AsyncWorker {
private:
int id;
char *data;
int dataLength;
size_t dataLength;
long type;
int flags;
int ret;
Expand All @@ -81,7 +86,8 @@ class ReceiveMessageWorker : public AsyncWorker {
~ReceiveMessageWorker() { }

void Execute() {
message = new msgbuf;
struct msgbuf* message =
(struct msgbuf*)malloc(bsize + bufferLength);

bufferLength = msgrcv(id, message, bufferLength, type, flags);
error = errno;
Expand Down Expand Up @@ -171,7 +177,7 @@ NAN_METHOD(SendMessage) {
int id = info[0]->Int32Value();
char* bufferData = node::Buffer::Data(info[1]);
size_t bufferLength = (size_t) node::Buffer::Length(info[1]);
long type = info[2]->Int32Value();
long type = (long) info[2]->Int32Value();
int flags = info[3]->Int32Value();
Callback *callback = new Callback(info[4].As<Function>());

Expand All @@ -181,7 +187,7 @@ NAN_METHOD(SendMessage) {
NAN_METHOD(ReceiveMessage) {
int id = info[0]->Int32Value();
size_t bufferLength = (size_t) info[1]->Int32Value();
long type = info[2]->Int32Value();
long type = (long) info[2]->Int32Value();
int flags = info[3]->Int32Value();
Callback *callback = new Callback(info[4].As<Function>());

Expand Down