changeset 1626:98ba8ca25feb

6936168: Recent fix for unmapping stack guard pages doesn't close /proc/self/maps Summary: Add close to returns (fix for 6929067 also contributed by aph) Reviewed-by: aph, dcubed, andrew, acorn Contributed-by: aph@redhat.com, andreas.kohn@fredhopper.com
author coleenp
date Thu, 18 Mar 2010 16:47:37 -0400
parents e392695de029
children 5d393243d487
files src/os/linux/vm/os_linux.cpp
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp	Wed Mar 17 11:01:05 2010 +0100
+++ b/src/os/linux/vm/os_linux.cpp	Thu Mar 18 16:47:37 2010 -0400
@@ -2528,6 +2528,7 @@
     char *str = NULL;
     ssize_t len = getline(&str, &dummy, f);
     if (len == -1) {
+      fclose(f);
       return false;
     }
 
@@ -2543,14 +2544,14 @@
         uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
         if (sp >= *bottom && sp <= *top) {
           free(str);
+          fclose(f);
           return true;
         }
       }
     }
-
     free(str);
   }
-
+  fclose(f);
   return false;
 }