Fix format-security warnings

pret · May 29, 2024 · c9f7b9a · c9f7b9a
1 parent 8a594d0
commit c9f7b9a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
@@ -3133,7 +3133,7 @@ build_unary_op (code, xarg, noconvert)
       return fold (build1 (code, argtype, arg));
     }
 
-  error (errstring);
+  error ("%s", errstring);
   return error_mark_node;
 }
 

diff --git a/gcc/real.c b/gcc/real.c
@@ -4042,8 +4042,6 @@ mtherr (name, code)
      char *name;
      int code;
 {
-  char errstr[80];
-
   /* The string passed by the calling program is supposed to be the
      name of the function in which the error occurred.
      The code argument selects which error message string will be printed.  */
@@ -4066,9 +4064,8 @@ mtherr (name, code)
     name = "modulus";
   else if (strcmp (name, "esqrt") == 0)
     name = "square root";
-  sprintf (errstr, "%s during real %s", ermsg[code], name);
   if (extra_warnings)
-    warning (errstr);
+    warning ("%s during real %s", ermsg[code], name);
   /* Set global error message word */
   merror = code + 1;
 }

diff --git a/gcc/toplev.c b/gcc/toplev.c
@@ -1061,7 +1061,7 @@ fatal_io_error(char *name)
 void
 fatal_insn(char *message, rtx insn)
 {
-    error(message);
+    error("%s", message);
     debug_rtx(insn);
     if (asm_out_file)
         fflush(asm_out_file);

diff --git a/gcc_arm/c-common.c b/gcc_arm/c-common.c
@@ -1587,7 +1587,7 @@ check_format_info (info, params)
 	      ++format_chars;
 	      if (params == 0)
 		{
-		  warning (tfaff);
+		  warning ("%s", tfaff);
 		  return;
 		}
 	      if (info->first_arg_num != 0)
@@ -1630,7 +1630,7 @@ check_format_info (info, params)
 		      ++format_chars;
 		      if (params == 0)
 		        {
-			  warning (tfaff);
+			  warning ("%s", tfaff);
 			  return;
 			}
 		      cur_param = TREE_VALUE (params);
@@ -1825,7 +1825,7 @@ check_format_info (info, params)
 	continue;
       if (params == 0)
 	{
-	  warning (tfaff);
+	  warning ("%s", tfaff);
 	  return;
 	}
       cur_param = TREE_VALUE (params);

diff --git a/gcc_arm/c-typeck.c b/gcc_arm/c-typeck.c
@@ -3147,7 +3147,7 @@ build_unary_op (code, xarg, noconvert)
       return fold (build1 (code, argtype, arg));
     }
 
-  error (errstring);
+  error ("%s", errstring);
   return error_mark_node;
 }
 

diff --git a/gcc_arm/cccp.c b/gcc_arm/cccp.c
@@ -8676,7 +8676,7 @@ macroexpand (hp, op)
       else
 	parse_error = macarg (NULL_PTR, 0);
       if (parse_error) {
-	error_with_line (line_for_error (start_line), parse_error);
+	error_with_line (line_for_error (start_line), "%s", parse_error);
 	break;
       }
       i++;

diff --git a/gcc_arm/real.c b/gcc_arm/real.c
@@ -5703,8 +5703,6 @@ mtherr (name, code)
      char *name;
      int code;
 {
-  char errstr[80];
-
   /* The string passed by the calling program is supposed to be the
      name of the function in which the error occurred.
      The code argument selects which error message string will be printed.  */
@@ -5727,9 +5725,8 @@ mtherr (name, code)
     name = "modulus";
   else if (strcmp (name, "esqrt") == 0)
     name = "square root";
-  sprintf (errstr, "%s during real %s", ermsg[code], name);
   if (extra_warnings)
-    warning (errstr);
+    warning ("%s during real %s", ermsg[code], name);
   /* Set global error message word */
   merror = code + 1;
 }

diff --git a/gcc_arm/toplev.c b/gcc_arm/toplev.c
@@ -1393,7 +1393,7 @@ fatal_insn (message, insn)
      char *message;
      rtx insn;
 {
-  error (message);
+  error ("%s", message);
   debug_rtx (insn);
   if (asm_out_file)
     fflush (asm_out_file);