generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-04 07:27:26 +01:00
Code Issues Projects Releases Wiki Activity

Problem: Issue #3766 states that strtok is not thread safe and should be replaced

Browse Source 
Solution: Replaced calls to strtok with strtok_r (strtok_s for windows)
in ws_engine.cpp
This commit is contained in:
Denis Collette 2020-01-22 19:40:26 -04:00
parent b7dd31db5a
commit 1450681fb4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ws_engine.cpp
View File

@ -73,6 +73,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ZMQ_HAVE_WINDOWS
#define strcasecmp _stricmp
#define strtok_r strtok_s
#else
#ifdef ZMQ_HAVE_LIBBSD
#include <bsd/string.h>
@ -487,7 +488,8 @@ bool zmq::ws_engine_t::server_handshake ()
// Sec-WebSocket-Protocol can appear multiple times or be a comma separated list
// if _websocket_protocol is already set we skip the check
if (_websocket_protocol[0] == '\0') {
char *p = strtok (_header_value, ",");
char *rest;
char *p = strtok_r (_header_value, ",", &rest);
while (p != NULL) {
if (*p == ' ')
p++;
@ -497,7 +499,7 @@ bool zmq::ws_engine_t::server_handshake ()
break;
}
p = strtok (NULL, ",");
p = strtok_r (NULL, ",", &rest);
}
}
}