1
1
diff -Npur -x .git a/CMakeLists.txt b/CMakeLists.txt
2
- --- a/CMakeLists.txt 2017-09-14 15:59:29.813198704 +0800
3
- +++ b/CMakeLists.txt 2017-09-14 16:01:09.589195047 +0800
2
+ --- a/CMakeLists.txt 2017-12-26 10:43:48.180704161 +0800
3
+ +++ b/CMakeLists.txt 2017-12-26 10:47:06.596700607 +0800
4
4
@@ -175,9 +175,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
5
5
# Default shared libraries
6
6
###############################################################################
@@ -13,8 +13,8 @@ diff -Npur -x .git a/CMakeLists.txt b/CMakeLists.txt
13
13
14
14
###############################################################################
15
15
diff -Npur -x .git a/include/fastrtps/utils/IPFinder.h b/include/fastrtps/utils/IPFinder.h
16
- --- a/include/fastrtps/utils/IPFinder.h 2017-09-14 15:55:02.933208485 +0800
17
- +++ b/include/fastrtps/utils/IPFinder.h 2017-09-14 16:01:09.693195043 +0800
16
+ --- a/include/fastrtps/utils/IPFinder.h 2017-12-26 10:43:48.296704159 +0800
17
+ +++ b/include/fastrtps/utils/IPFinder.h 2017-12-26 10:47:06.720700605 +0800
18
18
@@ -61,7 +61,7 @@ public:
19
19
IPFinder();
20
20
virtual ~IPFinder();
@@ -24,9 +24,21 @@ diff -Npur -x .git a/include/fastrtps/utils/IPFinder.h b/include/fastrtps/utils/
24
24
25
25
/**
26
26
* Get the IP4Adresses in all interfaces.
27
+ diff -Npur -x .git a/src/cpp/qos/ParameterList.cpp b/src/cpp/qos/ParameterList.cpp
28
+ --- a/src/cpp/qos/ParameterList.cpp 2017-12-26 10:43:48.184704161 +0800
29
+ +++ b/src/cpp/qos/ParameterList.cpp 2017-12-26 11:09:55.248676097 +0800
30
+ @@ -369,7 +369,7 @@ int32_t ParameterList::readParameterList
31
+ //cout << "Parameter length " << plength << endl;
32
+ uint32_t vec_size = 0;
33
+ valid&=CDRMessage::readUInt32(msg,&vec_size);
34
+ - if(!valid || msg->pos+vec_size > msg->length){
35
+ + if(!valid || msg->pos > msg->length - vec_size){
36
+ delete(p);
37
+ return -1;
38
+ }
27
39
diff -Npur -x .git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
28
- --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp 2017-09-14 15:59:29.821198703 +0800
29
- +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp 2017-09-14 16:01:09.593195047 +0800
40
+ --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp 2017-12-26 10:43:48.184704161 +0800
41
+ +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp 2017-12-26 10:47:06.600700607 +0800
30
42
@@ -129,6 +129,9 @@ bool EDPSimple::createSEDPEndpoints()
31
43
watt.times.nackResponseDelay.fraction = 0;
32
44
watt.times.initialHeartbeatDelay.seconds = 0;
@@ -83,8 +95,8 @@ diff -Npur -x .git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src
83
95
ratt.endpoint.reliabilityKind = RELIABLE;
84
96
pdata->m_builtinReaders.push_back(ratt);
85
97
diff -Npur -x .git a/src/cpp/transport/UDPv4Transport.cpp b/src/cpp/transport/UDPv4Transport.cpp
86
- --- a/src/cpp/transport/UDPv4Transport.cpp 2017-09-14 15:59:29.845198702 +0800
87
- +++ b/src/cpp/transport/UDPv4Transport.cpp 2017-09-14 16:01:09.593195047 +0800
98
+ --- a/src/cpp/transport/UDPv4Transport.cpp 2017-12-26 10:43:48.184704161 +0800
99
+ +++ b/src/cpp/transport/UDPv4Transport.cpp 2017-12-26 10:47:06.600700607 +0800
88
100
@@ -31,7 +31,7 @@ static const uint32_t maximumUDPSocketSi
89
101
static const uint32_t maximumMessageSize = 65500;
90
102
static const uint8_t defaultTTL = 1;
@@ -111,8 +123,8 @@ diff -Npur -x .git a/src/cpp/transport/UDPv4Transport.cpp b/src/cpp/transport/UD
111
123
}
112
124
113
125
diff -Npur -x .git a/thirdparty/fastcdr/CMakeLists.txt b/thirdparty/fastcdr/CMakeLists.txt
114
- --- a/thirdparty/fastcdr/CMakeLists.txt 2017-09-14 16:00:20.797196835 +0800
115
- +++ b/thirdparty/fastcdr/CMakeLists.txt 2017-09-14 16:01:09.629195045 +0800
126
+ --- a/thirdparty/fastcdr/CMakeLists.txt 2017-12-26 10:43:48.228704160 +0800
127
+ +++ b/thirdparty/fastcdr/CMakeLists.txt 2017-12-26 10:47:06.640700607 +0800
116
128
@@ -106,9 +106,7 @@ endif()
117
129
# Default shared libraries
118
130
###############################################################################
@@ -125,8 +137,8 @@ diff -Npur -x .git a/thirdparty/fastcdr/CMakeLists.txt b/thirdparty/fastcdr/CMak
125
137
126
138
###############################################################################
127
139
diff -Npur -x .git a/thirdparty/fastcdr/include/fastcdr/Cdr.h b/thirdparty/fastcdr/include/fastcdr/Cdr.h
128
- --- a/thirdparty/fastcdr/include/fastcdr/Cdr.h 2017-09-14 16:00:20.821196834 +0800
129
- +++ b/thirdparty/fastcdr/include/fastcdr/Cdr.h 2017-09-14 16:01:09.629195045 +0800
140
+ --- a/thirdparty/fastcdr/include/fastcdr/Cdr.h 2017-12-26 10:43:48.228704160 +0800
141
+ +++ b/thirdparty/fastcdr/include/fastcdr/Cdr.h 2017-12-26 10:47:06.644700607 +0800
130
142
@@ -726,6 +726,7 @@ namespace eprosima
131
143
* @exception exception::NotEnoughMemoryException This exception is thrown when trying to serialize a position that exceeds the internal memory size.
132
144
*/
@@ -162,8 +174,8 @@ diff -Npur -x .git a/thirdparty/fastcdr/include/fastcdr/Cdr.h b/thirdparty/fastc
162
174
#if HAVE_CXX0X
163
175
/*!
164
176
diff -Npur -x .git a/thirdparty/fastcdr/src/cpp/Cdr.cpp b/thirdparty/fastcdr/src/cpp/Cdr.cpp
165
- --- a/thirdparty/fastcdr/src/cpp/Cdr.cpp 2017-09-14 16:00:20.821196834 +0800
166
- +++ b/thirdparty/fastcdr/src/cpp/Cdr.cpp 2017-09-14 16:01:09.629195045 +0800
177
+ --- a/thirdparty/fastcdr/src/cpp/Cdr.cpp 2017-12-26 10:43:48.228704160 +0800
178
+ +++ b/thirdparty/fastcdr/src/cpp/Cdr.cpp 2017-12-26 10:47:06.640700607 +0800
167
179
@@ -570,6 +570,38 @@ Cdr& Cdr::serialize(const char *string_t
168
180
return *this;
169
181
}
0 commit comments