From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 19 Mar 2013 16:30:58 +0000 (-0700)
Subject: copy-file, rpmatch: fix problems found by cppcheck
X-Git-Tag: v0.1~168
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=63e2bc808bf6df53af15bf527f3a4b4920033676

copy-file, rpmatch: fix problems found by cppcheck

Reported by Arno Onken in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00069.html>.
* lib/rpmatch.c (try): Fix memory leak.
* lib/copy-file.c: Include "ignore-value.h".
(qcopy_file_preserving): Ignore chown value.
* modules/copy-file (Depends-on): Add ignore-value.
---

diff --git a/ChangeLog b/ChangeLog
index 98d74d335..cfa475140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	copy-file, rpmatch: fix problems found by cppcheck
+	Reported by Arno Onken in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00069.html>.
+	* lib/rpmatch.c (try): Fix memory leak.
+	* lib/copy-file.c: Include "ignore-value.h".
+	(qcopy_file_preserving): Ignore chown value.
+	* modules/copy-file (Depends-on): Add ignore-value.
+
 2013-01-27  Jim Meyering  <jim@meyering.net>
 
 	prefix-gnulib-mk: give better diagnostics
diff --git a/lib/copy-file.c b/lib/copy-file.c
index 0d4dcd6a7..56605229a 100644
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "error.h"
+#include "ignore-value.h"
 #include "safe-read.h"
 #include "full-write.h"
 #include "acl.h"
@@ -140,7 +141,7 @@ qcopy_file_preserving (const char *src_filename, const char *dest_filename)
 
 #if HAVE_CHOWN
   /* Preserve the owner and group.  */
-  chown (dest_filename, statbuf.st_uid, statbuf.st_gid);
+  ignore_value (chown (dest_filename, statbuf.st_uid, statbuf.st_gid));
 #endif
 
   /* Preserve the access permissions.  */
diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index cf1252381..ccb45f337 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -110,7 +110,10 @@ try (const char *response, const char *pattern, char **lastp, regex_t *re)
         return -1;
       /* Compile the pattern and cache it for future runs.  */
       if (regcomp (re, safe_pattern, REG_EXTENDED) != 0)
-        return -1;
+        {
+          free (safe_pattern);
+          return -1;
+        }
       *lastp = safe_pattern;
     }
 
diff --git a/modules/copy-file b/modules/copy-file
index 1c50d5585..2673ff023 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -13,6 +13,7 @@ error
 fstat
 full-write
 gettext-h
+ignore-value
 open
 quote
 safe-read