Sophie

Sophie

distrib > Mandriva > 2009.1 > x86_64 > by-pkgid > 3de00f3b97c88e86ab3138b6680657be > files > 12

grep-2.5.4-1mdv2009.1.src.rpm

--- src/search.c	2008-12-20 21:04:30.000000000 +0100
+++ src/search.c.oden	2008-12-20 21:03:59.000000000 +0100
@@ -108,7 +108,7 @@ size_t pcount;
 void
 dfaerror (char const *mesg)
 {
-  error (2, 0, mesg);
+  error (2, 0, "%s", mesg);
 }
 
 /* Number of compiled fixed strings known to exactly match the regexp.
@@ -138,7 +138,7 @@ kwsmusts (void)
 	    continue;
 	  ++kwset_exact_matches;
 	  if ((err = kwsincr (kwset, dm->must, strlen (dm->must))) != 0)
-	    error (2, 0, err);
+	    error (2, 0, "%s", err);
 	}
       /* Now, we compile the substrings that will require
 	 the use of the regexp matcher.  */
@@ -147,10 +147,10 @@ kwsmusts (void)
 	  if (dm->exact)
 	    continue;
 	  if ((err = kwsincr (kwset, dm->must, strlen (dm->must))) != 0)
-	    error (2, 0, err);
+	    error (2, 0, "%s", err);
 	}
       if ((err = kwsprep (kwset)) != 0)
-	error (2, 0, err);
+	error (2, 0, "%s", err);
     }
 }
 #endif /* !FGREP_PROGRAM */
@@ -204,7 +204,7 @@ GEAcompile (char const *pattern, size_t 
 
       if ((err = re_compile_pattern (motif, len,
 				    &(patterns[pcount].regexbuf))) != 0)
-	error (2, 0, err);
+	error (2, 0, "%s", err);
       pcount++;
 
       motif = sep;
@@ -717,7 +717,7 @@ fimb_fail:
 	      if (wclen == 0)
 		{
 		  if ((err = kwsincr (fimb_kwset, "", 0)) != 0)
-		    error (2, 0, err);
+		    error (2, 0, "%s", err);
 		}
 	      else
 		for (i = 0; i < (1 << wclen); i++)
@@ -740,7 +740,7 @@ fimb_fail:
 			p += k;
 		      }
 		    if ((err = kwsincr (fimb_kwset, starts, p - starts)) != 0)
-		      error (2, 0, err);
+		      error (2, 0, "%s", err);
 		  }
 	      if (wclim < wcpattern + wcsize)
 		++wclim;
@@ -752,7 +752,7 @@ fimb_fail:
 	  free (starts);
 	  Fimb.match = xmalloc (Fimb.count);
 	  if ((err = kwsprep (kwset)) != 0)
-	    error (2, 0, err);
+	    error (2, 0, "%s", err);
 	  return;
 	}
     }
@@ -766,7 +766,7 @@ fimb_fail:
       for (lim = beg; lim < pattern + size && *lim != '\n'; ++lim)
 	;
       if ((err = kwsincr (kwset, beg, lim - beg)) != 0)
-	error (2, 0, err);
+	error (2, 0, "%s", err);
       if (lim < pattern + size)
 	++lim;
       beg = lim;
@@ -774,7 +774,7 @@ fimb_fail:
   while (beg < pattern + size);
 
   if ((err = kwsprep (kwset)) != 0)
-    error (2, 0, err);
+    error (2, 0, "%s", err);
 }
 
 #ifdef MBS_SUPPORT
@@ -1183,11 +1183,11 @@ COMPILE_FCT(Pcompile)
 
   cre = pcre_compile (re, flags, &ep, &e, pcre_maketables ());
   if (!cre)
-    error (2, 0, ep);
+    error (2, 0, "%s", ep);
 
   extra = pcre_study (cre, 0, &ep);
   if (ep)
-    error (2, 0, ep);
+    error (2, 0, "%s", ep);
 
   free (re);
 #endif