Merge pull request #4721 from morxa/format-security-2

Fix format-security warnings (again)
IntelRealSense · Aug 27, 2019 · f700d9a · f700d9a
2 parents 8307154 + 0ef75da
commit f700d9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
@@ -3,7 +3,7 @@ message(STATUS "Setting Unix configurations")
 macro(os_set_flags)
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -pedantic -g -D_BSD_SOURCE")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic -g -Wno-missing-field-initializers")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar -Wsequence-point -Wformat-security")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar -Wsequence-point -Wformat -Wformat-security")
 
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE MACHINE)
     if(${MACHINE} MATCHES "arm-linux-gnueabihf")

diff --git a/common/model-views.cpp b/common/model-views.cpp
@@ -2408,7 +2408,7 @@ namespace rs2
                             ImColor(alpha(sensor_bg, 0.1f)));
 
                         ImGui::PushStyleColor(ImGuiCol_Text, redish);
-                        ImGui::Text(text);
+                        ImGui::Text("%s", text);
                         ImGui::PopStyleColor();
 
                         line_y += ImGui::GetTextLineHeight() + 3;
@@ -2425,13 +2425,13 @@ namespace rs2
                             ImColor(alpha(sensor_bg, 0.1f)));
 
                         ImGui::PushStyleColor(ImGuiCol_Text, white);
-                        ImGui::Text(text.c_str()); ImGui::SameLine();
+                        ImGui::Text("%s", text.c_str()); ImGui::SameLine();
 
                         if (at.description != "")
                         {
                             if (ImGui::IsItemHovered())
                             {
-                                ImGui::SetTooltip(at.description.c_str());
+                                ImGui::SetTooltip("%s", at.description.c_str());
                             }
                         }
 

diff --git a/common/notifications.cpp b/common/notifications.cpp
@@ -734,7 +734,7 @@ namespace rs2
         std::string txt = to_string() << "librealsense " << RS2_API_VERSION_STR << "!";
 
         ImGui::PushStyleColor(ImGuiCol_Text, alpha(white, 1.f - t));
-        ImGui::Text(txt.c_str());
+        ImGui::Text("%s", txt.c_str());
         ImGui::PopStyleColor();
         ImGui::PopFont();