fix warnings on Windows

wjwwood · wjwwood · commit f7786242d8a3 · 2018-06-15T18:48:42.000-07:00
diff --git a/rmw_connext_cpp/src/rmw_publish.cpp b/rmw_connext_cpp/src/rmw_publish.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <limits>
+
 #include "rmw/error_handling.h"
 #include "rmw/rmw.h"
 #include "rmw/types.h"
@@ -43,9 +45,13 @@ publish(DDSDataWriter * dds_data_writer, ConnextStaticCDRStream * cdr_stream)
   DDS_ReturnCode_t status = DDS_RETCODE_ERROR;
 
   instance->serialized_data.maximum(0);
+  if (cdr_stream->buffer_length > (std::numeric_limits<DDS_Long>::max)()) {
+    RMW_SET_ERROR_MSG("cdr_stream->buffer_length unexpectedly larger than DDS_Long's max value");
+    return false;
+  }
   if (!instance->serialized_data.loan_contiguous(
       reinterpret_cast<DDS_Octet *>(cdr_stream->buffer),
-      cdr_stream->buffer_length, cdr_stream->buffer_length))
+      static_cast<DDS_Long>(cdr_stream->buffer_length), cdr_stream->buffer_length))
   {
     RMW_SET_ERROR_MSG("failed to loan memory for message");
     goto cleanup;
diff --git a/rmw_connext_cpp/src/rmw_take.cpp b/rmw_connext_cpp/src/rmw_take.cpp
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <limits>
+
 #include "rmw/error_handling.h"
 #include "rmw/impl/cpp/macros.hpp"
 #include "rmw/types.h"
@@ -105,7 +107,14 @@ take(
     // TODO(karsten1987): This malloc has to go!
     cdr_stream->buffer =
       reinterpret_cast<char *>(malloc(cdr_stream->buffer_length * sizeof(char)));
-    for (size_t i = 0; i < cdr_stream->buffer_length; ++i) {
+
+    if (cdr_stream->buffer_length > (std::numeric_limits<unsigned int>::max)()) {
+      RMW_SET_ERROR_MSG("cdr_stream->buffer_length unexpectedly larger than max unsiged int value");
+      data_reader->return_loan(dds_messages, sample_infos);
+      *taken = false;
+      return DDS_RETCODE_ERROR;
+    }
+    for (unsigned int i = 0; i < static_cast<unsigned int>(cdr_stream->buffer_length); ++i) {
       cdr_stream->buffer[i] = dds_messages[0].serialized_data[i];
     }
     *taken = true;
