Merge pull request #34 from toyoge009/fix_readbaton

Fixed a problem that segmentation fault occurs when ReadWorker baton is overwitten.
thomaschaaf · Aug 20, 2019 · db26292 · db26292
2 parents af8f57f + 3e7bcb3
commit db26292
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ftdi",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "FTDI bindings for Node.js",
   "main": "index.js",
   "dependencies": {

diff --git a/src/ftdi_device.cc b/src/ftdi_device.cc
@@ -160,7 +160,9 @@ class ReadWorker : public Nan::AsyncWorker {
   // here, so everything we need for input and output
   // should go on `this`.
   void Execute () {
-    baton = new ReadBaton_t();
+    baton = &batonEntity;
+    baton->length = 0;
+    baton->data = NULL;
     status = FtdiDevice::ReadDataAsync(device, baton);
   }
 
@@ -203,7 +205,7 @@ class ReadWorker : public Nan::AsyncWorker {
       callback->Call(2, argv);
     }
 
-    if(baton->length != 0)
+    if(baton->data != NULL)
     {
       delete baton->data;
       baton->length = 0;
@@ -221,13 +223,13 @@ class ReadWorker : public Nan::AsyncWorker {
       AsyncQueueWorkerPersistent(this);
     }
 
-    delete baton;
   };
 
  private:
   FT_STATUS status;
   FtdiDevice* device;
   ReadBaton_t* baton;
+  ReadBaton_t batonEntity;
 };
 
 FT_STATUS FtdiDevice::ReadDataAsync(FtdiDevice* device, ReadBaton_t* baton)