Changeset 331 in flair-src for trunk

Timestamp:

Oct 1, 2019, 4:45:02 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

resolve aligment trap bug

Location:

trunk

Files:

• lib/FlairSensorActuator/src/VrpnClient_impl.cpp (modified) (2 diffs)
• tools/VrpnLite/src/VrpnLite.cpp (modified) (1 diff)

trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp

@@ -131 +131 @@
       liteObject_t tmp;
       tmp.vrpnobject = obj;
-      tmp.id = liteObjects.size();
+      uint16_t id=liteObjects.size();
       mutex->GetMutex();
       liteObjects.push_back(tmp);
@@ -137 +137 @@
       //Printf("%i %s\n",tmp.id,obj->self->ObjectName().c_str());
       
-      char char_array[obj->self->ObjectName().length() + 2];//id coded on 16bits 
-      strcpy(char_array, obj->self->ObjectName().c_str()); 
-      uint16_t* idPtr=(uint16_t*)&char_array[obj->self->ObjectName().length()];
-      *idPtr=tmp.id;
-      dataSocket->HostToNetwork((char*)idPtr,sizeof(uint16_t));
-      dataSocket->SendMessage(char_array,obj->self->ObjectName().length() + 2);
+      char char_array[obj->self->ObjectName().length() + sizeof(id)];
+      strcpy(char_array, obj->self->ObjectName().c_str());
+      dataSocket->HostToNetwork((char*)(&id),sizeof(id));
+      memcpy(&char_array[obj->self->ObjectName().length()],&id,sizeof(id));
+      dataSocket->SendMessage(char_array,obj->self->ObjectName().length() + sizeof(id));
     }else {
       self->Warn("too much trackables for vrpnlite connection, not adding %s\n",obj->self->ObjectName().c_str());

trunk/tools/VrpnLite/src/VrpnLite.cpp

@@ -53 +53 @@
     if(rcv>0) {
       string object=msg;
-      uint16_t* idPtr=(uint16_t*)&msg[rcv-2];
-      dataSocket->HostToNetwork((char*)idPtr,sizeof(uint16_t));
+      uint16_t id;
+      memcpy(&id,&msg[rcv-2],sizeof(id));
+      dataSocket->HostToNetwork((char*)&id,sizeof(id));
       //assume we receive it in the good order
-      if(*idPtr==vrpnobjects.size()) {
-        Printf("adding object %s with id %i\n",object.c_str(),*idPtr);
+      if(id==vrpnobjects.size()) {
+        Printf("adding object %s with id %i\n",object.c_str(),id);
         VrpnObject* vrpnobject = new VrpnObject(object,vrpnclient->GetTabWidget());
         vrpnobjects.push_back(vrpnobject);
       }else {
-        Err("adding object %s failed, expected id %i, got %i\n",object.c_str(),vrpnobjects.size(),*idPtr);
+        Err("adding object %s failed, expected id %i, got %i\n",object.c_str(),vrpnobjects.size(),id);
       }
     }