commit 8378187a17898addb0d007ded6becf86120c876b
author Jin Qian <jinqian@google.com> Fri May 05 20:01:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 05 20:01:37 2017 +0000
tree 0b2db4832d8fd63dba0964662d31144c6f0a254c
parent 1c503a2fb1b84f40b4a6a8e1ca09eb5f1098d956
parent fce05898955b60b90b51a599cf9a11a8c1adec8e

Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 am: 5975ee6a46
am: fce0589895

Change-Id: I15fc61221441c2c8e3d440ae2cc8e423f027c802

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);