Release (by relup.sh)

[packages/texlive.git] / format-security.patch

diff -ruNp texlive-20140525-source.orig/texk/devnag/src/devnag.c texlive-20140525-source/texk/devnag/src/devnag.c
--- texlive-20140525-source.orig/texk/devnag/src/devnag.c	2014-02-18 08:57:08.000000000 +0100
+++ texlive-20140525-source/texk/devnag/src/devnag.c	2014-06-14 20:07:06.525335916 +0200
@@ -2394,7 +2394,7 @@ void put_macro(short macro) {
 void err_ill(const char *str) {
    fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
 	  str, linenumber);
-   fprintf(stderr, inbuf);
+   fprintf(stderr, "%s", inbuf);
    exit(1);
 }
 
diff -ruNp texlive-20140525-source.orig/texk/dvidvi/dvidvi.c texlive-20140525-source/texk/dvidvi/dvidvi.c
--- texlive-20140525-source.orig/texk/dvidvi/dvidvi.c	2013-06-28 15:27:05.000000000 +0200
+++ texlive-20140525-source/texk/dvidvi/dvidvi.c	2014-06-14 20:00:16.415140190 +0200
@@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
  *   Print a usage error messsage, and quit.
  */
 static void usage(void) {
-   (void)fprintf(stderr,banner);
+   (void)fprintf(stderr,"%s",banner);
    (void)fprintf(stderr,"Usage:  dvidvi [options] input[.dvi] [output]\n");
    (void)fprintf(stderr,"where options are:\n");
    (void)fprintf(stderr,"    [-f n] first page printed     [-l n] last page printed\n");
@@ -806,7 +806,7 @@ default:
       } /* else argument with '-' */
    }  /* for */
    if (*iname == 0) {
-       (void)fprintf(stderr, banner) ;
+       (void)fprintf(stderr, "%s", banner) ;
        error("! no input file specified");
    }
    /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
@@ -817,7 +817,7 @@ default:
    }
 
    if (*oname != 0 && !quiet) {
-       (void)fprintf(stderr, banner) ;
+       (void)fprintf(stderr, "%s", banner) ;
        (void)fprintf(stderr, "%s -> %s\n",iname,oname);
        temp = nextstring ;
    }
diff -ruNp texlive-20140525-source.orig/texk/ps2pkm/objects.h texlive-20140525-source/texk/ps2pkm/objects.h
--- texlive-20140525-source.orig/texk/ps2pkm/objects.h	2009-06-22 16:33:57.000000000 +0200
+++ texlive-20140525-source/texk/ps2pkm/objects.h	2014-06-14 20:05:23.686788284 +0200
@@ -232,7 +232,7 @@ struct xobject {
 /*SHARED*/
 /* NDW: personally, I want to see status and error messages! */
 #define IfTrace0(condition,model)                                 \
-        {if (condition) printf(model);}
+        {if (condition) printf("%s",model);}
 #define IfTrace1(condition,model,arg0)                            \
         {if (condition) printf(model,arg0);}
 #define IfTrace2(condition,model,arg0,arg1)                       \
diff -ruNp texlive-20140525-source.orig/texk/web2c/cwebboot.cin texlive-20140525-source/texk/web2c/cwebboot.cin
--- texlive-20140525-source.orig/texk/web2c/cwebboot.cin	2014-02-12 09:50:58.000000000 +0100
+++ texlive-20140525-source/texk/web2c/cwebboot.cin	2014-06-14 20:02:53.573448687 +0200
@@ -1092,7 +1092,7 @@ void
  fatal(const char*s,const char*t)
 #line 1182 "cwebdir/common.w"
 {
-if(*s)printf(s);
+if(*s)printf("%s", s);
 err_print(t);
 history= fatal_message;exit(wrap_up());
 }
diff -ruNp texlive-20140525-source.orig/texk/web2c/cwebdir/common.w texlive-20140525-source/texk/web2c/cwebdir/common.w
--- texlive-20140525-source.orig/texk/web2c/cwebdir/common.w	2012-09-05 15:27:45.000000000 +0200
+++ texlive-20140525-source/texk/web2c/cwebdir/common.w	2014-06-14 20:06:21.331534710 +0200
@@ -1180,7 +1180,7 @@ concatenated to print the final error me
 fatal(s,t)
   char *s,*t;
 {
-  if (*s) printf(s);
+  if (*s) printf("%s", s);
   err_print(t);
   history=fatal_message; exit(wrap_up());
 }
diff -ruNp texlive-20140525-source.orig/texk/web2c/cwebdir/cweave.w texlive-20140525-source/texk/web2c/cwebdir/cweave.w
--- texlive-20140525-source.orig/texk/web2c/cwebdir/cweave.w	2012-09-05 15:27:45.000000000 +0200
+++ texlive-20140525-source/texk/web2c/cwebdir/cweave.w	2014-06-14 20:07:44.994166710 +0200
@@ -1784,7 +1784,7 @@ void
 print_cat(c) /* symbolic printout of a category */
 eight_bits c;
 {
-  printf(cat_name[c]);
+  printf("%s", cat_name[c]);
 }
 
 @ The token lists for translated \TEX/ output contain some special control
diff -ruNp texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.c texlive-20140525-source/texk/web2c/omegafonts/error_routines.c
--- texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.c	2009-11-10 11:27:09.000000000 +0100
+++ texlive-20140525-source/texk/web2c/omegafonts/error_routines.c	2014-06-14 20:15:08.791211601 +0200
@@ -32,6 +32,71 @@ They
 
 */
 
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+void
+lex_error(string fmt, ...)
+{
+ va_list ap;
+
+  fprintf(stderr, "line %d (lexing): ", line_number);
+  va_start(ap, fmt);
+  vfprintf(stderr, fmt, ap);
+  va_end(ap);
+  fprintf(stderr, "\n");
+}
+
+void
+fatal_error(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (fatal): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+ exit(1);
+}
+
+void
+yyerror(string fmt)
+{
+ fprintf(stderr, "line %d (parsing): ", line_number);
+ fprintf(stderr, "%s", fmt);
+ fprintf(stderr, "\n");
+}
+
+void
+warning_(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (warning): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+}
+
+void
+internal_error(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (internal): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+ exit(2);
+}
+
+#else
+
 void
 lex_error_0(const_string fmt)
 {
@@ -183,3 +248,5 @@ internal_error_s(const_string fmt, const
     fprintf(stderr, "\n");
     exit(2);
 }
+
+#endif
diff -ruNp texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.h texlive-20140525-source/texk/web2c/omegafonts/error_routines.h
--- texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.h	2009-11-10 11:27:09.000000000 +0100
+++ texlive-20140525-source/texk/web2c/omegafonts/error_routines.h	2014-06-14 20:16:02.988972567 +0200
@@ -21,6 +21,30 @@ along with Omega; if not, write to the F
 
 */
 
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#define lex_error_0(a) lex_error("%s", a)
+#define lex_error_1(a, b) lex_error(a, b)
+#define lex_error_s(a, b) lex_error(a, b)
+#define lex_error_s_1(a, b, c) lex_error(a, b, c)
+extern void lex_error(string, ...) __attribute__ ((format (printf, 1, 2)));
+#define fatal_error_0(a) fatal_error("%s", a)
+#define fatal_error_1(a, b) fatal_error(a, b)
+#define fatal_error_2(a, b, c) fatal_error(a, b, c)
+#define fatal_error_s(a, b) fatal_error(a, b)
+extern void fatal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
+extern void yyerror(string);
+#define warning_0(a) warning_("%s", a)
+#define warning_1(a, b) warning_(a, b)
+#define warning_2(a, b, c) warning_(a, b, c)
+#define warning_s(a, b) warning_(a, b)
+#define warning_s_1(a, b, c) warning_(a, b, c)
+#define warning_s_2(a, b, c, d) warning_(a, b, c, d)
+extern void warning_(string, ...) __attribute__ ((format (printf, 1, 2)));
+#define internal_error_0(a) internal_error("%s", a)
+#define internal_error_1(a, b) internal_error(a, b)
+#define internal_error_s(a, b) internal_error(a, b)
+extern void internal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
+#else
 extern void lex_error_0(const_string);
 extern void lex_error_1(const_string, int);
 extern void lex_error_s(const_string, const_string);
@@ -43,3 +67,4 @@ extern void warning_s_2(const_string, co
 extern void internal_error_0(const_string);
 extern void internal_error_1(const_string, int);
 extern void internal_error_s(const_string, const_string);
+#endif
diff -ruNp texlive-20140525-source.orig/texk/web2c/omegafonts/out_routines.c texlive-20140525-source/texk/web2c/omegafonts/out_routines.c
--- texlive-20140525-source.orig/texk/web2c/omegafonts/out_routines.c	2009-11-10 11:27:09.000000000 +0100
+++ texlive-20140525-source/texk/web2c/omegafonts/out_routines.c	2014-06-14 20:08:15.091034333 +0200
@@ -383,5 +383,5 @@ out_digits(unsigned counter)
 void
 out(const_string sval)
 {
-	fprintf(file_output, sval);
+	fprintf(file_output, "%s", sval);
 }
diff -ruNp texlive-20140525-source.orig/texk/web2c/tiedir/tie.w texlive-20140525-source/texk/web2c/tiedir/tie.w
--- texlive-20140525-source.orig/texk/web2c/tiedir/tie.w	2009-03-09 09:29:33.000000000 +0100
+++ texlive-20140525-source/texk/web2c/tiedir/tie.w	2014-06-14 20:08:56.648851552 +0200
@@ -465,7 +465,7 @@ for terminating an output line and writi
 @d new_line(v)  fputc('\n',v) /* start new line */
 @d term_new_line  new_line(term_out)
 	/* start new line of the terminal */
-@d print_ln(v)  {fprintf(term_out,v);term_new_line;}
+@d print_ln(v)  {fprintf(term_out,"%s",v);term_new_line;}
 	/* `|print|' and then start new line */
 @d print2_ln(a,b)  {print2(a,b);term_new_line;} /* same with two arguments */
 @d print3_ln(a,b,c)  {print3(a,b,c);term_new_line;}