format-security.patch

   1 --- dx-4.4.4/src/exec/dxmods/colormap.c~        2002-03-21 18:09:58.000000000 +0100
   2 +++ dx-4.4.4/src/exec/dxmods/colormap.c 2013-06-11 13:12:13.350684052 +0200
   3 @@ -1167,7 +1167,7 @@
   4        if (!ei.msgbuf)
   5          return ERROR;
   6        ei.mp = ei.msgbuf;
   7 -      sprintf(ei.mp,name);  while(*ei.mp) ei.mp++;
   8 +      sprintf(ei.mp,"%s",name);  while(*ei.mp) ei.mp++;
   9        sprintf(ei.mp, "NULL");
  10        DXUIMessage(id,ei.msgbuf);
  11        DXFree(ei.msgbuf);
  12 @@ -1186,7 +1186,7 @@
  13     ei.mp = ei.msgbuf;
  14     shape[0]=2;
  15     strcpy(ei.mp,"");
  16 -   sprintf(ei.mp,name); while(*ei.mp) ei.mp++;
  17 +   sprintf(ei.mp,"%s",name); while(*ei.mp) ei.mp++;
  18     if (num==1){
  19        sprintf(ei.mp,"{"); ei.mp++;
  20     }
  21 --- dx-4.4.4/src/exec/dxmods/exp_gai.c~ 2000-08-24 22:04:29.000000000 +0200
  22 +++ dx-4.4.4/src/exec/dxmods/exp_gai.c  2013-06-11 13:18:31.964648585 +0200
  23 @@ -422,7 +422,7 @@
  24             if (first == ON)
  25                first = OFF;
  26             else
  27 -              fprintf(h->dfp,del);
  28 +              fprintf(h->dfp,"%s",del);
  29             if (blank == ON)
  30                pblank(arinfo,h);
  31             else
  32 @@ -439,7 +439,7 @@
  33             if (first == ON)
  34                first = OFF;
  35             else
  36 -              fprintf(h->dfp,del);
  37 +              fprintf(h->dfp,"%s",del);
  38             if (blank == ON)
  39                pblank(arinfo,h);
  40             else
  41 @@ -456,7 +456,7 @@
  42             if (first == ON)
  43                first = OFF;
  44             else
  45 -              fprintf(h->dfp,del);
  46 +              fprintf(h->dfp,"%s",del);
  47             if (blank == ON)
  48                pblank(arinfo,h);
  49             else
  50 @@ -473,7 +473,7 @@
  51             if (first == ON)
  52                first = OFF;
  53             else
  54 -              fprintf(h->dfp,del);
  55 +              fprintf(h->dfp,"%s",del);
  56             if (blank == ON)
  57                pblank(arinfo,h);
  58             else
  59 @@ -490,7 +490,7 @@
  60             if (first == ON)
  61                first = OFF;
  62             else
  63 -              fprintf(h->dfp,del);
  64 +              fprintf(h->dfp,"%s",del);
  65             if (blank == ON)
  66                pblank(arinfo,h);
  67             else
  68 @@ -507,7 +507,7 @@
  69             if (first == ON)
  70                first = OFF;
  71             else
  72 -              fprintf(h->dfp,del);
  73 +              fprintf(h->dfp,"%s",del);
  74             if (blank == ON)
  75                pblank(arinfo,h);
  76             else
  77 @@ -524,7 +524,7 @@
  78             if (first == ON)
  79                first = OFF;
  80             else
  81 -              fprintf(h->dfp,del);
  82 +              fprintf(h->dfp,"%s",del);
  83             if (blank == ON)
  84                pblank(arinfo,h);
  85             else
  86 @@ -541,7 +541,7 @@
  87             if (first == ON)
  88                first = OFF;
  89             else
  90 -              fprintf(h->dfp,del);
  91 +              fprintf(h->dfp,"%s",del);
  92             if (blank == ON)
  93                pblank(arinfo,h);
  94             else
  95 @@ -554,7 +554,7 @@
  96                                   arinfo->last,scratch);
  97          arinfo->last = (Pointer)nextstr;
  98          if (first == OFF)
  99 -           fprintf(h->dfp,del);
 100 +           fprintf(h->dfp,"%s",del);
 101          if (blank == ON)
 102             pblank(arinfo,h);
 103          else {
 104 @@ -830,7 +830,7 @@
 105        if (rank > 0) {
 106          for (i=0; i<shape[0]; i++){
 107             if (i > 0)
 108 -              fprintf(h->dfp,del);
 109 +              fprintf(h->dfp,"%s",del);
 110             fprintf(h->dfp,"positions_cmp%d",i);
 111          }
 112        }
 113 @@ -845,13 +845,13 @@
 114            !strcmp("positions",depon) && strcmp("invalid positions",name)
 115           && strcmp("positions",name) ) {
 116          if (first == OFF)
 117 -           fprintf(h->dfp,del);
 118 +           fprintf(h->dfp,"%s",del);
 119          DXGetArrayInfo((Array)a,NULL,&type,NULL,&rank,shape);
 120          /* dim = (rank < 1) ? 1 : shape[0]; */
 121          if (type != TYPE_STRING && rank > 0 && shape[0] > 1) {
 122             cmp = (char *)DXAllocate(strlen(name)+6);
 123             for (j=0; j<shape[0]; j++) {
 124 -              if (j > 0) fprintf(h->dfp, del);
 125 +              if (j > 0) fprintf(h->dfp,"%s", del);
 126                sprintf(cmp,"%s_cmp%d",name,j);
 127                pstring(h->dfp,0,0,0,cmp);
 128             }
 129 --- dx-4.4.4/src/exec/dpexec/dxmain.c~  2006-05-08 18:20:03.000000000 +0200
 130 +++ dx-4.4.4/src/exec/dpexec/dxmain.c   2013-06-11 13:23:52.217999584 +0200
 131 @@ -2129,7 +2129,7 @@
 132      if ((SFILEisatty(yyin) || (_dxd_exRshInput && yyin == _dxd_exBaseFD)) &&
 133              !prompted && _dxf_ExGQAllDone() && !SFILECharReady(yyin)) {
 134          prompt = _dxf_ExPromptGet(PROMPT_ID_PROMPT);
 135 -        printf (prompt? prompt: EX_PROMPT);
 136 +        printf ("%s",prompt? prompt: EX_PROMPT);
 137          fflush (stdout);
 138          prompted = TRUE;
 139      }
 140 @@ -2305,7 +2305,7 @@
 141         _dxf_ExGQAllDone ())\
 142      {\
 143         prompt = _dxf_ExPromptGet (PROMPT_ID_PROMPT);\
 144 -       printf (prompt ? prompt : EX_PROMPT);\
 145 +       printf ("%s",prompt ? prompt : EX_PROMPT);\
 146         fflush (stdout);\
 147         prompted = TRUE;\
 148      }\
 149 --- dx-4.4.4/src/exec/dpexec/lex.c~     2006-01-09 23:57:34.000000000 +0100
 150 +++ dx-4.4.4/src/exec/dpexec/lex.c      2013-06-11 13:24:53.625308550 +0200
 151 @@ -648,7 +648,7 @@
 152                     if ((_dxd_exIsatty || _dxd_exRshInput) && !SFILECharReady(yyin))
 153                     {
 154                         prompt = _dxf_ExPromptGet(PROMPT_ID_CPROMPT);
 155 -                       printf (prompt? prompt: EX_CPROMPT);
 156 +                       printf ("%s",prompt? prompt: EX_CPROMPT);
 157                         fflush (stdout);
 158                     }
 159                     break;
 160 --- dx-4.4.4/src/uipp/dxuilib/DXApplication.C~  2013-06-11 13:08:39.031771731 +0200
 161 +++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C   2013-06-11 13:27:50.373831329 +0200
 162 @@ -2553,7 +2553,7 @@
 163                 const char* errmsg =
 164                         GraphLayout::SetHeightPerLevel (DXApplication::resource.autoLayoutHeight);
 165                 if (errmsg) {
 166 -                       fprintf (stderr, errmsg);
 167 +                       fprintf (stderr, "%s", errmsg);
 168                         return FALSE;
 169                 }
 170         }
 171 @@ -2561,7 +2561,7 @@
 172                 const char* errmsg =
 173                         GraphLayout::SetGroupSpacing (DXApplication::resource.autoLayoutGroupSpacing);
 174                 if (errmsg) {
 175 -                       fprintf (stderr, errmsg);
 176 +                       fprintf (stderr, "%s", errmsg);
 177                         return FALSE;
 178                 }
 179         }
 180 @@ -2569,7 +2569,7 @@
 181                 const char* errmsg =
 182                         GraphLayout::SetNodeSpacing (DXApplication::resource.autoLayoutNodeSpacing);
 183                 if (errmsg) {
 184 -                       fprintf (stderr, errmsg);
 185 +                       fprintf (stderr, "%s", errmsg);
 186                         return FALSE;
 187                 }
 188         }
 189 @@ -3787,7 +3787,7 @@
 190      if (this->anchor)
 191         InfoMessage(msg);
 192      else
 193 -       fprintf(stderr,msg);
 194 +       fprintf(stderr,"%s",msg);
 195
 196      return NULL;
 197  }
 198 @@ -5019,7 +5019,7 @@
 199         fprintf (stderr, "Attempting to save any modified files.\n"
 200             "Please check saved files for integrity by reloading them.\n");
 201         theDXApplication->emergencySave (msg);
 202 -       fprintf (stderr, msg);
 203 +       fprintf (stderr, "%s", msg);
 204      }
 205
 206      fprintf(stderr,"The application will now abort.\n");
 207 @@ -5035,7 +5035,7 @@
 208      if (theDXApplication) {
 209         char msg[4096];
 210         this->emergencySave(msg);
 211 -       fprintf(stderr, msg);
 212 +       fprintf(stderr, "%s", msg);
 213      }
 214
 215      this->IBMApplication::abortApplication();
 216 --- dx-4.4.4/src/uipp/dxl/conn.c~       2006-05-08 18:20:08.000000000 +0200
 217 +++ dx-4.4.4/src/uipp/dxl/conn.c        2013-06-11 13:30:02.578553195 +0200
 218 @@ -389,7 +389,7 @@
 219             char buf[2048];
 220             int n = read(err,buf,2048);
 221             buf[n] = '\0';
 222 -           fprintf(stderr,buf);
 223 +           fprintf(stderr,"%s",buf);
 224         }
 225  #if defined(intelnt) || defined(WIN32)
 226      TerminateProcess(child, -1);
 227 --- dx-4.4.4/src/uipp/dxui/SelectionNode.C~     2002-03-25 17:42:08.000000000 +0100
 228 +++ dx-4.4.4/src/uipp/dxui/SelectionNode.C      2013-06-11 13:31:19.139357071 +0200
 229 @@ -960,7 +960,7 @@
 230         ListIterator it(selection_stmts);
 231         char* cp;
 232         while ( (cp = (char*)it.getNext()) ) {
 233 -           fprintf (jf, cp);
 234 +           fprintf (jf, "%s", cp);
 235             delete cp;
 236         }
 237      }