segfault fix for Connect()

mathiask88 · mathiask88 · commit 97c09c5c0381 · 2014-06-15T14:12:20.000+02:00
diff --git a/src/node_snap7_client.cpp b/src/node_snap7_client.cpp
@@ -255,8 +255,9 @@ namespace node_snap7{
 			NanReturnValue(NanNew<v8::Boolean>(s7client->snap7Client->Connect() == 0));
 		}
 		else{
+			char* address = new char(0);
 			NanCallback *callback = new NanCallback(args[0].As<v8::Function>());
-			NanAsyncQueueWorker(new ConnectionWorker(callback, s7client, "", 0, 0));
+			NanAsyncQueueWorker(new ConnectionWorker(callback, s7client, address, 0, 0));
 			NanReturnUndefined();
 		}
 	}
@@ -733,15 +734,16 @@ namespace node_snap7{
 		}
 
 		if (!args[1]->IsFunction()){
-			TS7BlocksOfType BlockList;
-			int BlockNum = sizeof(BlockList) / sizeof(*BlockList);
-
-			int returnValue = s7client->snap7Client->ListBlocksOfType(args[0]->Uint32Value(), &BlockList, &BlockNum);
+			int BlockNum = sizeof(TS7BlocksOfType) / sizeof(PS7BlocksOfType);
+			PS7BlocksOfType BlockList = new TS7BlocksOfType[BlockNum];
+			
+			int returnValue = s7client->snap7Client->ListBlocksOfType(args[0]->Uint32Value(), BlockList, &BlockNum);
 
 			v8::Local<v8::Array> block_list = NanNew<v8::Array>(BlockNum);
 			for (int i = 0; i < BlockNum; i++) {
-				block_list->Set(i, NanNew<v8::Integer>(BlockList[i]));
+				block_list->Set(i, NanNew<v8::Integer>(*BlockList[i]));
 			}
+			delete[] BlockList;
 
 			if (returnValue == 0)
 				NanReturnValue(block_list);

Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,9 @@ namespace node_snap7{`
`255`	`255`	`NanReturnValue(NanNew<v8::Boolean>(s7client->snap7Client->Connect() == 0));`
`256`	`256`	`}`
`257`	`257`	`else{`
	`258`	`+ char* address = new char(0);`
`258`	`259`	`NanCallback *callback = new NanCallback(args[0].As<v8::Function>());`
`259`		`- NanAsyncQueueWorker(new ConnectionWorker(callback, s7client, "", 0, 0));`
	`260`	`+ NanAsyncQueueWorker(new ConnectionWorker(callback, s7client, address, 0, 0));`
`260`	`261`	`NanReturnUndefined();`
`261`	`262`	`}`
`262`	`263`	`}`
`@@ -733,15 +734,16 @@ namespace node_snap7{`
`733`	`734`	`}`
`734`	`735`
`735`	`736`	`if (!args[1]->IsFunction()){`
`736`		`- TS7BlocksOfType BlockList;`
`737`		`- int BlockNum = sizeof(BlockList) / sizeof(*BlockList);`
`738`		`-`
`739`		`- int returnValue = s7client->snap7Client->ListBlocksOfType(args[0]->Uint32Value(), &BlockList, &BlockNum);`
	`737`	`+ int BlockNum = sizeof(TS7BlocksOfType) / sizeof(PS7BlocksOfType);`
	`738`	`+ PS7BlocksOfType BlockList = new TS7BlocksOfType[BlockNum];`
	`739`	`+`
	`740`	`+ int returnValue = s7client->snap7Client->ListBlocksOfType(args[0]->Uint32Value(), BlockList, &BlockNum);`
`740`	`741`
`741`	`742`	`v8::Local<v8::Array> block_list = NanNew<v8::Array>(BlockNum);`
`742`	`743`	`for (int i = 0; i < BlockNum; i++) {`
`743`		`- block_list->Set(i, NanNew<v8::Integer>(BlockList[i]));`
	`744`	`+ block_list->Set(i, NanNew<v8::Integer>(*BlockList[i]));`
`744`	`745`	`}`
	`746`	`+ delete[] BlockList;`
`745`	`747`
`746`	`748`	`if (returnValue == 0)`
`747`	`749`	`NanReturnValue(block_list);`