RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/build/ files.c

From: Jeff Johnson <n3npq@mac.com>
Date: Mon 07 Jul 2008 - 07:15:21 CEST
Message-id: <A07F872C-EA4B-43B7-97BC-3A9C384A47C2@mac.com>
Thank you!

I can go back to bed now ;-)

73 de Jeff

On Jul 7, 2008, at 12:11 AM, Alexey Tourbin wrote:

>   RPM Package Manager, CVS Repository
>   http://rpm5.org/cvs/
>    
> ______________________________________________________________________ 
> ______
>
>   Server: rpm5.org                         Name:   Alexey Tourbin
>   Root:   /v/rpm/cvs                       Email:  at@rpm5.org
>   Module: rpm                              Date:   07-Jul-2008  
> 06:11:16
>   Branch: HEAD                             Handle: 2008070704111600
>
>   Modified files:
>     rpm/build               files.c
>
>   Log:
>     genCpioListAndHeader: changed fi->fnlen calculation from  
> fileURL back
>     to diskURL, should fix segfault
>
>   Summary:
>     Revision    Changes     Path
>     1.337       +2  -1      rpm/build/files.c
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: rpm/build/files.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.336 -r1.337 files.c
>   --- rpm/build/files.c	6 Jul 2008 04:24:42 -0000	1.336
>   +++ rpm/build/files.c	7 Jul 2008 04:11:16 -0000	1.337
>   @@ -1667,7 +1667,8 @@
>    	}
>
>    	{
>   -	    size_t fnlen = strlen(flp->fileURL);
>   +	    /* this fi uses diskURL (with buildroot), not fileURL */
>   +	    size_t fnlen = strlen(flp->diskURL);
>    	    if (fnlen > fi->fnlen) {
>    		/* fnlen-sized buffer must not be allocated yet */
>    		assert(fi->fn == NULL);
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Fri Jul 11 17:35:26 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.