From: Ivailo <xakepa10@gmail.com>
Date: Thu, 5 Dec 2013 09:56:20 +0000 (+0900)
Subject: libgrep: Fix issues detected by gcc -Wformat-security
X-Git-Tag: v0.18.3.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea77f13f7e64620dbc772d3c596bd14a83517015;p=thirdparty%2Fgettext.git

libgrep: Fix issues detected by gcc -Wformat-security

* m-fgrep.c (Fcompile): Supply FORMAT argument of error.
* m-regex.c (compile): Likewise.
---

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 53ba7a3a5..2e3f36db9 100644
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-05  Ivailo  <xakepa10@gmail.com>  (tiny change)
+
+	libgrep: Fix issues detected by gcc -Wformat-security
+	* m-fgrep.c (Fcompile): Supply FORMAT argument of error.
+	* m-regex.c (compile): Likewise.
+
 2012-12-25  Daiki Ueno  <ueno@gnu.org>
 
 	* gettext-0.18.2 released.
diff --git a/gettext-tools/libgrep/m-fgrep.c b/gettext-tools/libgrep/m-fgrep.c
index 7bb3715eb..1f4d58d1f 100644
--- a/gettext-tools/libgrep/m-fgrep.c
+++ b/gettext-tools/libgrep/m-fgrep.c
@@ -106,7 +106,7 @@ Fcompile (const char *pattern, size_t pattern_size,
       for (lim = beg; lim < pattern + pattern_size && *lim != '\n'; ++lim)
         ;
       if ((err = kwsincr (ckwset->kwset, beg, lim - beg)) != NULL)
-        error (exit_failure, 0, err);
+        error (exit_failure, 0, "%s", err);
       if (lim < pattern + pattern_size)
         ++lim;
       beg = lim;
@@ -114,7 +114,7 @@ Fcompile (const char *pattern, size_t pattern_size,
   while (beg < pattern + pattern_size);
 
   if ((err = kwsprep (ckwset->kwset)) != NULL)
-    error (exit_failure, 0, err);
+    error (exit_failure, 0, "%s", err);
   return ckwset;
 }
 
diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c
index d5d3dd14e..544497869 100644
--- a/gettext-tools/libgrep/m-regex.c
+++ b/gettext-tools/libgrep/m-regex.c
@@ -106,7 +106,7 @@ compile (const char *pattern, size_t pattern_size,
 
         if ((err = re_compile_pattern (motif, len,
                                        &cregex->patterns[cregex->pcount].regexbuf)) != NULL)
-          error (exit_failure, 0, err);
+          error (exit_failure, 0, "%s", err);
         cregex->pcount++;
 
         motif = sep;