summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Fradin <benoit.fradin@intel.com>2013-08-28 14:44:32 +0200
committerXiaokang Qin <xiaokang.qin@intel.com>2014-04-30 15:44:10 +0800
commit7b4448de8deaef2512fb0b17a30facc47b2f4a87 (patch)
tree8df2fbb0975c3ca76986698061ee6f1992fd0f6f
parent79950456925b801273cd93d03145aba8477a9eb4 (diff)
downloadextras-7b4448de8deaef2512fb0b17a30facc47b2f4a87.tar.gz
The situation len = 0 and absolute = false need to be handled
Add a return case for len == 0 and absolute == false Change-Id: Ia36bd67ced6abbe7234eb7e485c1a2d8bd928ffe Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
-rw-r--r--ext4_utils/make_ext4fs.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index b9a24b83..f164883e 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -427,8 +427,11 @@ static char *canonicalize_slashes(const char *str, bool absolute)
int newlen = len;
char *ptr;
- if (len == 0 && absolute) {
- return strdup("/");
+ if (len == 0) {
+ if (absolute)
+ return strdup("/");
+ else
+ return strdup("");
}
if (str[0] != '/' && absolute) {