From: Thomas Preud'homme Date: Wed, 25 Nov 2015 06:29:00 +0000 (+0800) Subject: Fix building objcopy under mingw64 X-Git-Tag: users/ARM/embedded-binutils-2_26-branch-2016q1~110 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f34cdbd2ad208d02188acef0f5291a42495a0e4e;p=thirdparty%2Fbinutils-gdb.git Fix building objcopy under mingw64 2015-11-25 Tejas Belagod Backport from mainline: 2015-11-20 Ronald Hoogenboom * objcopy.c (parse_symflags): Use xstrndup in place of strndup. (copy_main): Likewise. --- diff --git a/binutils/ChangeLog b/binutils/ChangeLog index caff375d7d6..99b3f084a4e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2015-11-25 Tejas Belagod + + Backport from mainline: + 2015-11-20 Ronald Hoogenboom + + * objcopy.c (parse_symflags): Use xstrndup in place of strndup. + (copy_main): Likewise. + 2015-11-20 Nick Clifton * po/ca.po: New Catalan translation. diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 0ff85251e59..4a9f043d2ec 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -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