Add field length limits to scanf invocations.

MythTV · Aug 27, 2011 · 71384be · 71384be
1 parent 115daf9
commit 71384be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/mythtv/programs/mythcommflag/HistogramAnalyzer.cpp b/mythtv/programs/mythcommflag/HistogramAnalyzer.cpp
@@ -41,7 +41,7 @@ readData(QString filename, float *mean, unsigned char *median, float *stddev,
     {
         int monochromaticval, medianval, widthval, heightval, colval, rowval;
         float meanval, stddevval;
-        int nitems = fscanf(fp, "%d %f %d %f %d %d %d %d",
+        int nitems = fscanf(fp, "%20d %20f %20d %20f %20d %20d %20d %20d",
                 &monochromaticval, &meanval, &medianval, &stddevval,
                 &widthval, &heightval, &colval, &rowval);
         if (nitems != 8)
@@ -62,7 +62,7 @@ readData(QString filename, float *mean, unsigned char *median, float *stddev,
         }
         for (unsigned int ii = 0; ii < sizeof(counter)/sizeof(*counter); ii++)
         {
-            if ((nitems = fscanf(fp, "%x", &counter[ii])) != 1)
+            if ((nitems = fscanf(fp, "%20x", &counter[ii])) != 1)
             {
                 LOG(VB_COMMFLAG, LOG_ERR,
                     QString("Not enough data in %1: frame %2")

diff --git a/mythtv/programs/mythcommflag/TemplateMatcher.cpp b/mythtv/programs/mythcommflag/TemplateMatcher.cpp
@@ -108,7 +108,7 @@ bool readMatches(QString filename, unsigned short *matches, long long nframes)
 
     for (frameno = 0; frameno < nframes; frameno++)
     {
-        int nitems = fscanf(fp, "%hu", &matches[frameno]);
+        int nitems = fscanf(fp, "%20hu", &matches[frameno]);
         if (nitems != 1)
         {
             LOG(VB_COMMFLAG, LOG_ERR,

diff --git a/mythtv/programs/mythcommflag/pgm.cpp b/mythtv/programs/mythcommflag/pgm.cpp
@@ -66,7 +66,8 @@ int pgm_read(unsigned char *buf, int width, int height, const char *filename)
         return -1;
     }
 
-    if ((nn = fscanf(fp, "P5\n%d %d\n%d\n", &fwidth, &fheight, &maxgray)) != 3)
+    if ((nn = fscanf(fp, "P5\n%20d %20d\n%20d\n",
+                     &fwidth, &fheight, &maxgray)) != 3)
     {
         LOG(VB_COMMFLAG, LOG_ERR, QString("pgm_read fscanf %1 failed: %2")
                 .arg(filename).arg(strerror(errno)));