Changeset 5547211b for functions.c

Timestamp:

Dec 13, 2008, 5:32:06 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Children:

1c014eec

Parents:

44fc93b

git-author:

Anders Kaseorg <andersk@mit.edu> (12/06/08 23:20:19)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/13/08 17:32:06)

Message:

Replace questionable sprintf(buf, "%s...", buf, ...) pattern, which is
broken by -D_FORTIFY_SOURCE.

perl -pe 's/(sprintf\s*\(\s*([^,]*))(\s*,\s*")%s([^"]*"\s*,)\s*\2\s*,/\1 + strlen(\2)\3\4/g'

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -1642 +1642 @@
         /* fix this */
         sprintf(buff, "  Checkd Ath: %i\n", n->z_checked_auth);
-        sprintf(buff, "%s  Multi notc: %s\n", buff, n->z_multinotice);
-        sprintf(buff, "%s  Num other : %i\n", buff, n->z_num_other_fields);
-        sprintf(buff, "%s  Msg Len   : %i\n", buff, n->z_message_len);
+        sprintf(buff + strlen(buff), "  Multi notc: %s\n", n->z_multinotice);
+        sprintf(buff + strlen(buff), "  Num other : %i\n", n->z_num_other_fields);
+        sprintf(buff + strlen(buff), "  Msg Len   : %i\n", n->z_message_len);
         owl_fmtext_append_normal(&fm, buff);
         
@@ -2589 +2589 @@
   sprintf(argbuff, "class ^(un)*%s(\\.d)*$", tmpclass);
   if (tmpinstance) {
-    sprintf(argbuff, "%s and ( instance ^(un)*%s(\\.d)*$ )", argbuff, tmpinstance);
+    sprintf(argbuff + strlen(argbuff), " and ( instance ^(un)*%s(\\.d)*$ )", tmpinstance);
   }
   owl_free(tmpclass);
@@ -2999 +2999 @@
     owl_text_tr(quoted, '\'', '.');
     owl_text_tr(quoted, '"', '.');
-    sprintf(buff, "%s ^(un)*%s(\\.d)*$", buff, quoted);
+    sprintf(buff + strlen(buff), " ^(un)*%s(\\.d)*$", quoted);
     owl_free(quoted);
   }
@@ -3009 +3009 @@
     owl_text_tr(quoted, '\'', '.');
     owl_text_tr(quoted, '"', '.');
-    sprintf(buff, "%s and instance ^(un)*%s(\\.d)*$", buff, quoted);
+    sprintf(buff + strlen(buff), " and instance ^(un)*%s(\\.d)*$", quoted);
     owl_free(quoted);
   }
@@ -3017 +3017 @@
     owl_text_tr(quoted, '\'', '.');
     owl_text_tr(quoted, '"', '.');
-    sprintf(buff, "%s and recipient ^%s$", buff, quoted);
+    sprintf(buff + strlen(buff), " and recipient ^%s$", quoted);
     owl_free(quoted);
   }