summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2019-04-22 14:45:58 -0700
committerRoman Kiryanov <rkir@google.com>2019-04-22 15:18:47 -0700
commitbc5f3e081b8efe0ca466d331ce9bfa11e53c75f6 (patch)
treed52aac3c28a84104e7aeb419285716d249db2054
parentf317778e9bf29bf1fb3430ada0acf4f9332096e8 (diff)
downloadgoldfish-bc5f3e081b8efe0ca466d331ce9bfa11e53c75f6.tar.gz
Revert "Revert "ANDROID: dm: do_mounts_dm: fix dm_substitute_devices()""
This reverts commit 357c3d313225f9999aa8db335080c02e566f0d17. Bug: 130662334 Change-Id: I92490329b4d2488d1bde7004eb3ff7109e099d94 Signed-off-by: Roman Kiryanov <rkir@google.com>
-rw-r--r--init/do_mounts_dm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/do_mounts_dm.c b/init/do_mounts_dm.c
index 0171ee71bd16..019ce09d8176 100644
--- a/init/do_mounts_dm.c
+++ b/init/do_mounts_dm.c
@@ -176,7 +176,8 @@ static void __init dm_substitute_devices(char *str, size_t str_len)
continue;
/* Temporarily terminate with a nul */
- candidate_end--;
+ if (*candidate_end)
+ candidate_end--;
old_char = *candidate_end;
*candidate_end = '\0';