Shouldn't call munmap(2) if mmap(2) failed in catopen(3)

2011-07-12 Thread Matthew Dempsky 
ok?

Index: catopen.c
===
RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/nls/catopen.c,v
retrieving revision 1.13
diff -U5 -p -r1.13 catopen.c
--- catopen.c   26 Jun 2008 05:42:05 -  1.13
+++ catopen.c   12 Jul 2011 21:05:47 -
@@ -131,11 +131,10 @@ load_msgcat(const char *path)
 
data = mmap(0, (size_t) st.st_size, PROT_READ, MAP_SHARED, fd, 
(off_t)0);
close (fd);
 
if (data == MAP_FAILED) {
-   munmap(data, (size_t) st.st_size);
return (nl_catd) -1;
}
 
if (ntohl(((struct _nls_cat_hdr *) data)-__magic) != _NLS_MAGIC) {
munmap(data, (size_t) st.st_size);

Re: Shouldn't call munmap(2) if mmap(2) failed in catopen(3)

2011-07-12 Thread Damien Miller 
ok djm@

On Tue, 12 Jul 2011, Matthew Dempsky wrote:

 ok?
 
 Index: catopen.c
 ===
 RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/nls/catopen.c,v
 retrieving revision 1.13
 diff -U5 -p -r1.13 catopen.c
 --- catopen.c 26 Jun 2008 05:42:05 -  1.13
 +++ catopen.c 12 Jul 2011 21:05:47 -
 @@ -131,11 +131,10 @@ load_msgcat(const char *path)
  
   data = mmap(0, (size_t) st.st_size, PROT_READ, MAP_SHARED, fd, 
 (off_t)0);
   close (fd);
  
   if (data == MAP_FAILED) {
 - munmap(data, (size_t) st.st_size);
   return (nl_catd) -1;
   }
  
   if (ntohl(((struct _nls_cat_hdr *) data)-__magic) != _NLS_MAGIC) {
   munmap(data, (size_t) st.st_size);

Re: Shouldn't call munmap(2) if mmap(2) failed in catopen(3)

2011-07-12 Thread Ariane van der Steldt 
On Tue, Jul 12, 2011 at 02:10:07PM -0700, Matthew Dempsky wrote:
 ok?

ok ariane@

 Index: catopen.c
 ===
 RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/nls/catopen.c,v
 retrieving revision 1.13
 diff -U5 -p -r1.13 catopen.c
 --- catopen.c 26 Jun 2008 05:42:05 -  1.13
 +++ catopen.c 12 Jul 2011 21:05:47 -
 @@ -131,11 +131,10 @@ load_msgcat(const char *path)
  
   data = mmap(0, (size_t) st.st_size, PROT_READ, MAP_SHARED, fd, 
 (off_t)0);
   close (fd);
  
   if (data == MAP_FAILED) {
 - munmap(data, (size_t) st.st_size);
   return (nl_catd) -1;
   }
  
   if (ntohl(((struct _nls_cat_hdr *) data)-__magic) != _NLS_MAGIC) {
   munmap(data, (size_t) st.st_size);
 

-- 
Ariane