Fix building objcopy under mingw64 by replacing uses of strndup with xstrndup.

* objcopy.c (parse_symflags): Use xstrndup in place of strndup.
	(copy_main): Likewise.
This commit is contained in:
Ronald Hoogenboom 2015-11-20 14:08:29 +00:00 committed by Nick Clifton
parent f075eb5e6b
commit a4f8732b2a
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2015-11-20 Ronald Hoogenboom <hoogenboom30@zonnet.nl>
* objcopy.c (parse_symflags): Use xstrndup in place of strndup.
(copy_main): Likewise.
2015-11-20 Nick Clifton <nickc@redhat.com>
* po/ca.po: New Catalan translation.

View File

@ -771,7 +771,7 @@ parse_symflags (const char *s, char **other)
#define PARSE_OTHER(fname,fval) \
else if (len >= (int) sizeof fname && strncasecmp (fname, s, sizeof fname - 1) == 0) \
fval = strndup (s + sizeof fname - 1, len - sizeof fname + 1)
fval = xstrndup (s + sizeof fname - 1, len - sizeof fname + 1)
if (0) ;
PARSE_FLAG ("local", BSF_LOCAL);
@ -4082,10 +4082,10 @@ copy_main (int argc, char *argv[])
fatal (_("bad format for %s"), "--add-symbol");
t = strchr (s + 1, ':');
newsym->symdef = strndup (optarg, s - optarg);
newsym->symdef = xstrndup (optarg, s - optarg);
if (t)
{
newsym->section = strndup (s + 1, t - (s + 1));
newsym->section = xstrndup (s + 1, t - (s + 1));
newsym->symval = strtol (t + 1, NULL, 0);
}
else