fix crash at port open (#1772)

serialport · Jan 11, 2019 · 415891c · 415891c
1 parent 8fc58a4
commit 415891c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/bindings/src/serialport.h b/packages/bindings/src/serialport.h
@@ -82,14 +82,17 @@ struct OpenBaton : public Nan::AsyncResource {
 #endif
 };
 
-struct ConnectionOptionsBaton : public Nan::AsyncResource {
-  ConnectionOptionsBaton() :
-    AsyncResource("node-serialport:ConnectionOptionsBaton"), errorString() {}
+struct ConnectionOptions {
+  ConnectionOptions() : errorString() {}
   char errorString[ERROR_STRING_SIZE];
-  Nan::Callback callback;
   int fd = 0;
   int baudRate = 0;
 };
+struct ConnectionOptionsBaton : ConnectionOptions, Nan::AsyncResource {
+  ConnectionOptionsBaton() :
+    AsyncResource("node-serialport:ConnectionOptionsBaton") {}
+  Nan::Callback callback;
+};
 
 struct SetBaton : public Nan::AsyncResource {
   SetBaton() : AsyncResource("node-serialport:SetBaton"), errorString() {}
@@ -131,5 +134,5 @@ struct VoidBaton : public Nan::AsyncResource {
 };
 
 int setup(int fd, OpenBaton *data);
-int setBaudRate(ConnectionOptionsBaton *data);
+int setBaudRate(ConnectionOptions *data);
 #endif  // PACKAGES_SERIALPORT_SRC_SERIALPORT_H_
diff --git a/packages/bindings/src/serialport_unix.cpp b/packages/bindings/src/serialport_unix.cpp
@@ -95,7 +95,7 @@ void EIO_Open(uv_work_t* req) {
   data->result = fd;
 }
 
-int setBaudRate(ConnectionOptionsBaton *data) {
+int setBaudRate(ConnectionOptions *data) {
   // lookup the standard baudrates from the table
   int baudRate = ToBaudConstant(data->baudRate);
   int fd = data->fd;
@@ -281,7 +281,7 @@ int setup(int fd, OpenBaton *data) {
   }
 
   // Copy the connection options into the ConnectionOptionsBaton to set the baud rate
-  ConnectionOptionsBaton* connectionOptions = new ConnectionOptionsBaton();
+  ConnectionOptions* connectionOptions = new ConnectionOptions();
   connectionOptions->fd = fd;
   connectionOptions->baudRate = data->baudRate;