commit f347c1abcac3bb1684d1ae329e3c229e7bf0b5b7
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 05 19:39:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 05 19:39:25 2017 +0000
tree c268c8d7004621b7f1336d75b985876349568ccb
parent a24f9d7cc7b742cfa373104626f6f0bf0b4eae18
parent adeb41a8c0da3122a2907acb4aafd7ff9bce26af

Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0"

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index 6e5ef98..727736b 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -232,14 +232,14 @@
                            << ") not supported on " << v->fs_type;
                 return -1;
             }
-            char *num_sectors;
-            if (asprintf(&num_sectors, "%zd", length / 512) <= 0) {
+            char *num_sectors = nullptr;
+            if (length >= 512 && asprintf(&num_sectors, "%zd", length / 512) <= 0) {
                 LOG(ERROR) << "format_volume: failed to create " << v->fs_type
                            << " command for " << v->blk_device;
                 return -1;
             }
             const char *f2fs_path = "/sbin/mkfs.f2fs";
-            const char* const f2fs_argv[] = {"mkfs.f2fs", "-t", "-d1", v->blk_device, num_sectors, NULL};
+            const char* const f2fs_argv[] = {"mkfs.f2fs", "-t", "-d1", v->blk_device, num_sectors, nullptr};
 
             result = exec_cmd(f2fs_path, (char* const*)f2fs_argv);
             free(num_sectors);