fixed dangling pointer using std::string

robotology · Aug 28, 2024 · e0dee96 · e0dee96
1 parent c5e4d05
commit e0dee96
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src/libYARP_manager/src/yarp/manager/broker.h b/src/libYARP_manager/src/yarp/manager/broker.h
@@ -47,7 +47,7 @@ class Broker {
                             const char* carrier) = 0;
     virtual int  running() = 0; // 0 if is not running and 1 if is running; otherwise -1.
     virtual bool exists(const char* port) = 0;
-    virtual const char* requestRpc(const char* szport, const char* request, double timeout=0.0) = 0;
+    virtual std::string requestRpc(const char* szport, const char* request, double timeout=0.0) = 0;
     virtual bool connected(const char* from, const char* to,
                            const char* carrier) = 0;
     virtual const char* error() = 0;

diff --git a/src/libYARP_manager/src/yarp/manager/execstate.cpp b/src/libYARP_manager/src/yarp/manager/execstate.cpp
@@ -127,10 +127,10 @@ bool Ready::checkResources(bool silent)
         }
         // check the rpc request/reply if required
         if(strlen((*itr).getRequest()) != 0) {
-            const char* reply = executable->getBroker()->requestRpc((*itr).getPort(),
+            std::string reply = executable->getBroker()->requestRpc((*itr).getPort(),
                                                                     (*itr).getRequest(),
                                                                     (*itr).getTimeout());
-            if(reply == nullptr) {
+            if(reply.empty()) {
                 allOK = false;
                 OSTRINGSTREAM msg;
                 msg<<"cannot request resource "<<(*itr).getPort()<<" for "<<(*itr).getRequest();
@@ -142,7 +142,7 @@ bool Ready::checkResources(bool silent)
                 }
             }
 
-            if(!compareString(reply, (*itr).getReply())) {
+            if (!compareString(reply.c_str(), (*itr).getReply())) {
                 allOK = false;
                 OSTRINGSTREAM msg;
                 msg<<"waiting for the expected reply from resource "<<(*itr).getPort();

diff --git a/src/libYARP_manager/src/yarp/manager/localbroker.cpp b/src/libYARP_manager/src/yarp/manager/localbroker.cpp
@@ -445,21 +445,21 @@ bool LocalBroker::exists(const char* port)
 }
 
 
-const char* LocalBroker::requestRpc(const char* szport, const char* request, double timeout)
+std::string LocalBroker::requestRpc(const char* szport, const char* request, double timeout)
 {
     if ((szport == nullptr) || (request == nullptr)) {
-        return nullptr;
+        return {};
     }
 
     if (!exists(szport)) {
-        return nullptr;
+        return {};
     }
 
     // opening the port
     yarp::os::Port port;
     port.setTimeout((float)((timeout>0.0) ? timeout : CONNECTION_TIMEOUT));
     if (!port.open("...")) {
-        return nullptr;
+        return {};
     }
 
     ContactStyle style;
@@ -476,7 +476,7 @@ const char* LocalBroker::requestRpc(const char* szport, const char* request, dou
 
     if(!ret) {
         port.close();
-        return nullptr;
+        return {};
     }
 
     Bottle msg, response;
@@ -485,7 +485,7 @@ const char* LocalBroker::requestRpc(const char* szport, const char* request, dou
     NetworkBase::disconnect(port.getName(), szport);
     if(!response.size() || !ret) {
         port.close();
-        return nullptr;
+        return {};
     }
 
     port.close();

diff --git a/src/libYARP_manager/src/yarp/manager/localbroker.h b/src/libYARP_manager/src/yarp/manager/localbroker.h
@@ -56,7 +56,7 @@ class LocalBroker: public Broker, public yarp::os::Thread {
                     const char *carrier) override;
     int running() override;
     bool exists(const char* port) override;
-    const char* requestRpc(const char* szport, const char* request, double timeout) override;
+    std::string requestRpc(const char* szport, const char* request, double timeout) override;
     bool connected(const char* from, const char* to,
                    const char* carrier) override;
     const char* error() override;

diff --git a/src/libYARP_manager/src/yarp/manager/yarpbroker.cpp b/src/libYARP_manager/src/yarp/manager/yarpbroker.cpp
@@ -529,21 +529,21 @@ bool YarpBroker::exists(const char* szport)
     return NetworkBase::exists(szport, style);
 }
 
-const char* YarpBroker::requestRpc(const char* szport, const char* request, double timeout)
+std::string YarpBroker::requestRpc(const char* szport, const char* request, double timeout)
 {
     if ((szport == nullptr) || (request == nullptr)) {
-        return nullptr;
+        return {};
     }
 
     if (!exists(szport)) {
-        return nullptr;
+        return {};
     }
 
     // opening the port
     yarp::os::Port port;
     port.setTimeout((float)((timeout>0.0) ? timeout : CONNECTION_TIMEOUT));
     if (!port.open("...")) {
-        return nullptr;
+        return {};
     }
 
     ContactStyle style;
@@ -560,7 +560,7 @@ const char* YarpBroker::requestRpc(const char* szport, const char* request, doub
 
     if(!ret) {
         port.close();
-        return nullptr;
+        return {};
     }
 
     Bottle msg, response;
@@ -569,7 +569,7 @@ const char* YarpBroker::requestRpc(const char* szport, const char* request, doub
     NetworkBase::disconnect(port.getName(), szport);
     if(!response.size() || !ret) {
         port.close();
-        return nullptr;
+        return {};
     }
 
     port.close();

diff --git a/src/libYARP_manager/src/yarp/manager/yarpbroker.h b/src/libYARP_manager/src/yarp/manager/yarpbroker.h
@@ -49,7 +49,7 @@ class YarpBroker: public Broker, public yarp::os::PeriodicThread {
      bool rmconnect(const char* from, const char* to);
      int running() override;
      bool exists(const char* port) override;
-     const char* requestRpc(const char* szport, const char* request, double timeout) override;
+     std::string requestRpc(const char* szport, const char* request, double timeout) override;
      bool connected(const char* from, const char* to, const char* carrier) override;
      const char* error() override;
      bool initialized() override { return bInitialized;}