commit 714edda9f373ae22b1cd02b7761b47ab0a37bb6c
author Mark Salyzyn <salyzyn@google.com> Thu Oct 09 14:30:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 09 14:30:31 2014 +0000
tree 121b8b32ab463b5efdfc263308596926b20e268a
parent 49d1ba1743528ae492a24851e4632b0af5917ef5
parent 3e64bf45e65641c0dd946de6eefa552718f14c1c

am 3e64bf45: am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"

* commit '3e64bf45e65641c0dd946de6eefa552718f14c1c':
  fs_mgr: fix build breakage

fs_mgr/fs_mgr_verity.c

diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c
index da3c0f9..01f7844 100644
--- a/fs_mgr/fs_mgr_verity.c
+++ b/fs_mgr/fs_mgr_verity.c
@@ -399,6 +399,7 @@
         goto out;
     }
 
+    verity_table = verity_table_signature = NULL;
     // read the verity block at the end of the block device
     if (read_verity_metadata(fstab->blk_device,
                                     &verity_table_signature,