ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mount: fix incorrect string length calculation"

Browse source
This commit is contained in:
Nick Kralevich 2013-04-24 23:38:46 +00:00 • committed by Gerrit Code Review
commit 5ea5854315
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 #define LOOPDEV_MAXLEN 64
struct mount_opts { struct mount_opts {
const char str[8]; const char str[16];
unsigned long rwmask; unsigned long rwmask;
unsigned long rwset; unsigned long rwset;
unsigned long rwnoset; unsigned long rwnoset;
@ -65,10 +65,11 @@ static const struct mount_opts options[] = {
static void add_extra_option(struct extra_opts *extra, char *s) static void add_extra_option(struct extra_opts *extra, char *s)
{ {
int len = strlen(s); int len = strlen(s);
int newlen = extra->used_size + len; int newlen;
if (extra->str) if (extra->str)
len++; /* +1 for ',' */ len++; /* +1 for ',' */
newlen = extra->used_size + len;
if (newlen >= extra->alloc_size) { if (newlen >= extra->alloc_size) {
char *new; char *new;
@ -79,7 +80,7 @@ static void add_extra_option(struct extra_opts *extra, char *s)
extra->str = new; extra->str = new;
extra->end = extra->str + extra->used_size; extra->end = extra->str + extra->used_size;
extra->alloc_size = newlen; extra->alloc_size = newlen + 1;
} }
if (extra->used_size) { if (extra->used_size) {