RE: [PATCH] 'add symbol' feature in objcopy

["Tejas Belagod" <tejas.belagod@foss.arm.com>]

[-- Attachment #1: Type: text/plain, Size: 2245 bytes --]



> -----Original Message-----
> From: Tristan Gingold [mailto:gingold@adacore.com]
> Sent: 20 November 2015 15:38
> To: Tejas Belagod
> Cc: binutils@sourceware.org
> Subject: Re: [PATCH] 'add symbol' feature in objcopy
> 
> 
> > On 20 Nov 2015, at 16:29, Tejas Belagod <tejas.belagod@foss.arm.com>
> wrote:
> >
> > Hi Tristian,
> >
> > Is this patch OK to backport to 2.26?
> 
> Sure.
> 
> Tristan.
> >

Thanks. Here is the backport built and tested arm-none-eabi for mingw and
linux.

I don't have commit rights to binutils. Please could someone who does,
commit this?

binutils/ChangeLog

2015-11-23  Tejas Belagod  <tejas.belagod@arm.com>

	Backport from mainline:
	2015-11-20  Ronald Hoogenboom  <hoogenboom30@zonnet.nl>

	* objcopy.c (parse_symflags): Use xstrndup in place of strndup.
	(copy_main): Likewise.

Thanks,
Tejas.


> > Thanks,
> > Tejas.
> >
> >> -----Original Message-----
> >> From: Tejas Belagod [mailto:tejas.belagod@foss.arm.com]
> >> Sent: 20 November 2015 14:44
> >> To: 'Nick Clifton'; 'Ronald Hoogenboom'
> >> Cc: binutils@sourceware.org
> >> Subject: RE: [PATCH] 'add symbol' feature in objcopy
> >>
> >> Nick,
> >>
> >> Is this OK to backport to 2.26?
> >>
> >> Thanks,
> >> Tejas.
> >>
> >>>
> >>> -----Original Message-----
> >>> From: binutils-owner@sourceware.org [mailto:binutils-
> >>> owner@sourceware.org] On Behalf Of Nick Clifton
> >>> Sent: 20 November 2015 14:10
> >>> To: Ronald Hoogenboom; fracting@gmail.com
> >>> Cc: binutils@sourceware.org
> >>> Subject: Re: [PATCH] 'add symbol' feature in objcopy
> >>>
> >>> Hi Ronald,
> >>>
> >>>> Apparently, the strndup function is not 'portable' enough for mingw-
> w64.
> >>>> There seems to be a xstrndup function in libiberty that could be used
> >>>> instead. I'm sorry I don't have all the possible compilers handy to
> >>>> verify all possible targets, but this should do.
> >>>
> >>> Thanks - I have gone ahead and checked this patch in along with the
> >>> following copyright notice.
> >>>
> >>> Cheers
> >>>   Nick
> >>>
> >>> binutils/ChangeLog
> >>> 2015-11-20  Ronald Hoogenboom  <hoogenboom30@zonnet.nl>
> >>>
> >>>        * objcopy.c (parse_symflags): Use xstrndup in place of strndup.
> >>>        (copy_main): Likewise.
> >>>
> >>>
> >
> >


[-- Attachment #2: objcopy-226.txt --]
[-- Type: text/plain, Size: 1005 bytes --]

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 0ff8525..4a9f043 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