diff options
| author | Nick Kralevich <nnk@google.com> | 2013-04-24 16:31:02 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-04-24 16:31:02 -0700 |
| commit | 29a5298366f0070bcc359e982eb31d49f84a92c1 (patch) | |
| tree | 99cb0dab6206c792e0e17390c95fc86019323693 /toolbox | |
| parent | cb6a842c6e2048e6cd3c5a2d478113347c75d7aa (diff) | |
| download | system_core-29a5298366f0070bcc359e982eb31d49f84a92c1.zip system_core-29a5298366f0070bcc359e982eb31d49f84a92c1.tar.gz system_core-29a5298366f0070bcc359e982eb31d49f84a92c1.tar.bz2 | |
mount: fix incorrect string length calculation
Fix bug https://code.google.com/p/android/issues/detail?id=54192
which incorrectly calculated the length of a string.
Fix compiler warning:
system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default]
system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default]
Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/mount.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolbox/mount.c b/toolbox/mount.c index b7adce2..bcda2a2 100644 --- a/toolbox/mount.c +++ b/toolbox/mount.c @@ -19,7 +19,7 @@ #define LOOPDEV_MAXLEN 64 struct mount_opts { - const char str[8]; + const char str[16]; unsigned long rwmask; unsigned long rwset; unsigned long rwnoset; @@ -65,10 +65,11 @@ static const struct mount_opts options[] = { static void add_extra_option(struct extra_opts *extra, char *s) { int len = strlen(s); - int newlen = extra->used_size + len; + int newlen; if (extra->str) len++; /* +1 for ',' */ + newlen = extra->used_size + len; if (newlen >= extra->alloc_size) { char *new; @@ -79,7 +80,7 @@ static void add_extra_option(struct extra_opts *extra, char *s) extra->str = new; extra->end = extra->str + extra->used_size; - extra->alloc_size = newlen; + extra->alloc_size = newlen + 1; } if (extra->used_size) { |