From a8e5cb12200e1c4fb34fb1ee7a8ae36b479b990c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 30 Mar 2021 11:29:26 -0700 Subject: [PATCH] prevent corrupted log messages (#20530) old-commit-hash: 0847cf686931eb3992791e7db5239e6bfe697c1c --- selfdrive/common/swaglog.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/selfdrive/common/swaglog.cc b/selfdrive/common/swaglog.cc index 5c69c0a949..c1e168fde5 100644 --- a/selfdrive/common/swaglog.cc +++ b/selfdrive/common/swaglog.cc @@ -89,8 +89,7 @@ void log(int levelnum, const char* filename, int lineno, const char* func, const printf("%s: %s\n", filename, msg); } char levelnum_c = levelnum; - zmq_send(s.sock, &levelnum_c, 1, ZMQ_NOBLOCK | ZMQ_SNDMORE); - zmq_send(s.sock, log_s.c_str(), log_s.length(), ZMQ_NOBLOCK); + zmq_send(s.sock, (levelnum_c + log_s).c_str(), log_s.length() + 1, ZMQ_NOBLOCK); } void cloudlog_e(int levelnum, const char* filename, int lineno, const char* func,