openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 5ea58543: Merge "mount: fix incorrect string length calculation" 

* commit '5ea58543154a97c42c0b7fc58c2639a4fea64f5b':
  mount: fix incorrect string length calculation
This commit is contained in:
Nick Kralevich 2013-04-24 17:36:11 -07:00 committed by Android Git Automerger
parent 0db6600a60 5ea5854315
commit 4c1840e654
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolbox/mount.c
View File

@ -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) {