format-security.patch

   1 --- xf86-video-sis-0.10.7/src/sis_driver.c.orig 2013-04-07 21:43:38.806080625 +0200
   2 +++ xf86-video-sis-0.10.7/src/sis_driver.c      2013-04-07 21:45:02.936957482 +0200
   3 @@ -426,17 +426,16 @@
   4  SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
   5  {
   6      va_list ap;
   7 -    static const char *str = "**************************************************\n";
   8
   9      va_start(ap, format);
  10 -    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
  11 +    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "**************************************************\n");
  12      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
  13         "                      ERROR:\n");
  14      xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
  15      va_end(ap);
  16      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
  17         "                  END OF MESSAGE\n");
  18 -    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
  19 +    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "**************************************************\n");
  20  }
  21
  22  static void
  23 @@ -1785,7 +1784,6 @@
  24      DisplayModePtr currentMode, firstMode;
  25      Bool infochanged = FALSE;
  26      Bool usenonrect = pSiS->NonRect;
  27 -    const char *rectxine = "\t... setting up rectangular Xinerama layout\n";
  28
  29      pSiS->MBXNR1XMAX = pSiS->MBXNR1YMAX = pSiS->MBXNR2XMAX = pSiS->MBXNR2YMAX = 65536;
  30      pSiS->HaveNonRect = pSiS->HaveOffsRegions = FALSE;
  31 @@ -1914,14 +1912,14 @@
  32         if(infochanged && !usenonrect) {
  33           xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
  34                         "Virtual screen size does not match maximum display modes...\n");
  35 -         xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
  36 +         xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "\t... setting up rectangular Xinerama layout\n");
  37
  38         }
  39      } else if(infochanged && usenonrect) {
  40         usenonrect = FALSE;
  41         xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
  42                 "Only clone modes available for this virtual screen size...\n");
  43 -       xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
  44 +       xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "\t... setting up rectangular Xinerama layout\n");
  45      }
  46
  47      if(pSiS->maxCRT1_X1) {             /* Means we have at least one non-clone mode */