Sfoglia il codice sorgente

Replace sprintf with snprintf

Camilla Berglund 9 anni fa
parent
commit
ea1958a948
3 ha cambiato i file con 14 aggiunte e 13 eliminazioni
  1. 2 2
      tests/events.c
  2. 8 7
      tests/monitors.c
  3. 4 4
      tests/tearing.c

+ 2 - 2
tests/events.c

@@ -221,7 +221,7 @@ static const char* get_button_name(int button)
         default:
         default:
         {
         {
             static char name[16];
             static char name[16];
-            sprintf(name, "%i", button);
+            snprintf(name, sizeof(name), "%i", button);
             return name;
             return name;
         }
         }
     }
     }
@@ -555,7 +555,7 @@ int main(int argc, char** argv)
         slots[i].closeable = GLFW_TRUE;
         slots[i].closeable = GLFW_TRUE;
         slots[i].number = i + 1;
         slots[i].number = i + 1;
 
 
-        sprintf(title, "Event Linter (Window %i)", slots[i].number);
+        snprintf(title, sizeof(title), "Event Linter (Window %i)", slots[i].number);
 
 
         if (monitor)
         if (monitor)
         {
         {

+ 8 - 7
tests/monitors.c

@@ -59,13 +59,14 @@ static const char* format_mode(const GLFWvidmode* mode)
     static char buffer[512];
     static char buffer[512];
     const int gcd = euclid(mode->width, mode->height);
     const int gcd = euclid(mode->width, mode->height);
 
 
-    sprintf(buffer,
-            "%i x %i x %i (%i:%i) (%i %i %i) %i Hz",
-            mode->width, mode->height,
-            mode->redBits + mode->greenBits + mode->blueBits,
-            mode->width / gcd, mode->height / gcd,
-            mode->redBits, mode->greenBits, mode->blueBits,
-            mode->refreshRate);
+    snprintf(buffer,
+             sizeof(buffer),
+             "%i x %i x %i (%i:%i) (%i %i %i) %i Hz",
+             mode->width, mode->height,
+             mode->redBits + mode->greenBits + mode->blueBits,
+             mode->width / gcd, mode->height / gcd,
+             mode->redBits, mode->greenBits, mode->blueBits,
+             mode->refreshRate);
 
 
     buffer[sizeof(buffer) - 1] = '\0';
     buffer[sizeof(buffer) - 1] = '\0';
     return buffer;
     return buffer;

+ 4 - 4
tests/tearing.c

@@ -79,10 +79,10 @@ static void update_window_title(GLFWwindow* window)
 {
 {
     char title[256];
     char title[256];
 
 
-    sprintf(title, "Tearing detector (interval %i%s, %0.1f Hz)",
-            swap_interval,
-            (swap_tear && swap_interval < 0) ? " (swap tear)" : "",
-            frame_rate);
+    snprintf(title, sizeof(title), "Tearing detector (interval %i%s, %0.1f Hz)",
+             swap_interval,
+             (swap_tear && swap_interval < 0) ? " (swap tear)" : "",
+             frame_rate);
 
 
     glfwSetWindowTitle(window, title);
     glfwSetWindowTitle(window, title);
 }
 }