OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: check asprintf return values 

These are the last sources of build warnings (asprintf usage) that I see.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-01-12 21:58:08 +00:00
parent 1b05df007b
commit 39a3ae0a21
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sim/common/ChangeLog
View File

@ -1,3 +1,14 @@
2011-01-12 Mike Frysinger <vapier@gentoo.org>
* sim-module.c (sim_pre_argv_init): Return SIM_RC_FAIL when asprintf
fails.
* sim-options.c (sim_parse_args): Issue an error and return SIM_RC_FAIL
when asprintf fails.
* sim-utils.c (sim_do_commandf): Issue an error and return when
asprintf fails.
* sim-watch.c (sim_watchpoint_install): Return SIM_RC_FAIL when
asprintf fails.
2011-01-11 Mike Frysinger <vapier@gentoo.org>
* sim-memopt.c (do_memopt_add): Set nr_bytes to s.st_size before

3
sim/common/sim-module.c
View File

@ -88,7 +88,8 @@ sim_pre_argv_init (SIM_DESC sd, const char *myname)
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
{
char *name;
asprintf (&name, "cpu%d", i);
if (asprintf (&name, "cpu%d", i) < 0)
return SIM_RC_FAIL;
CPU_NAME (STATE_CPU (sd, i)) = name;
}
}

7
sim/common/sim-options.c
View File

@ -621,7 +621,12 @@ sim_parse_args (SIM_DESC sd, char **argv)
char *name;
*lp = opt->opt;
/* Prepend --<cpuname>- to the option. */
asprintf (&name, "%s-%s", CPU_NAME (cpu), lp->name);
if (asprintf (&name, "%s-%s", CPU_NAME (cpu), lp->name) < 0)
{
sim_io_eprintf (sd, "internal error, out of memory");
result = SIM_RC_FAIL;
break;
}
lp->name = name;
/* Dynamically assign `val' numbers for long options. */
lp->val = i++;

7
sim/common/sim-utils.c
View File

@ -336,7 +336,12 @@ sim_do_commandf (SIM_DESC sd,
va_list ap;
char *buf;
va_start (ap, fmt);
vasprintf (&buf, fmt, ap);
if (vasprintf (&buf, fmt, ap) < 0)
{
sim_io_eprintf (sd, "%s: asprintf failed for `%s'\n",
STATE_MY_NAME (sd), fmt);
return;
}
sim_do_command (sd, buf);
va_end (ap);
free (buf);

7
sim/common/sim-watch.c
View File

@ -412,9 +412,10 @@ sim_watchpoint_install (SIM_DESC sd)
char *name;
int nr = interrupt_nr * nr_watchpoint_types + type;
OPTION *option = &int_options[nr];
asprintf (&name, "watch-%s-%s",
watchpoint_type_to_str (sd, type),
interrupt_nr_to_str (sd, interrupt_nr));
if (asprintf (&name, "watch-%s-%s",
watchpoint_type_to_str (sd, type),
interrupt_nr_to_str (sd, interrupt_nr)) < 0)
return SIM_RC_FAIL;
option->opt.name = name;
option->opt.has_arg = required_argument;
option->opt.val = type_to_option (sd, type, interrupt_nr);