commit a2a93250f625b776886d3c5d41599abdaddb2e50
author Elliott Hughes <enh@google.com> Wed Sep 18 16:38:14 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 18 16:38:14 2013 -0700
tree 854e190a80301b251aa331a3854fce6e1def6a6f
parent 9f25b565f716d865597dd24761137a93f08d4bb1
parent c67bd8d7cd9b43a5a5ef249ea787ac9786359d22

am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"

* commit 'c67bd8d7cd9b43a5a5ef249ea787ac9786359d22':
  Fix fstab memory leak

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index dabbc27..9a84a4e 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -244,7 +244,7 @@
     char *line = NULL;
     const char *delim = " \t";
     char *save_ptr, *p;
-    struct fstab *fstab;
+    struct fstab *fstab = NULL;
     struct fstab_rec *recs;
     struct fs_mgr_flag_values flag_vals;
 #define FS_OPTIONS_LEN 1024
@@ -363,7 +363,10 @@
     return fstab;
 
 err:
+    fclose(fstab_file);
     free(line);
+    if (fstab)
+        fs_mgr_free_fstab(fstab);
     return NULL;
 }
 
@@ -379,7 +382,6 @@
         free(fstab->recs[i].fs_options);
         free(fstab->recs[i].key_loc);
         free(fstab->recs[i].label);
-        i++;
     }
 
     /* Free the fstab_recs array created by calloc(3) */