[PING patch]: PR/4987: windres does not get stdin input file

[PING patch]: PR/4987: windres does not get stdin input file

[Kai Tietz]

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

Hi,

This fix is obvious. A missing check for nil filename leads to 
segmentation fault.
I tested this patch for cygwin and linux environment.

ChangeLog:

2007-09-11      Alon Bar-Lev  <alon.barlev@gmail.com>

        * resrc.c: (read_rc_file): Move 'filename' default initialization 
in
        front to function begin.

Cheers,
 i.A. Kai Tietz



|  (\_/)  This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| (")_(") world domination.

------------------------------------------------------------------------------------------
  OneVision Software Entwicklungs GmbH & Co. KG
  Dr.-Leo-Ritter-Straße 9 - 93049 Regensburg
  Tel: +49.(0)941.78004.0 - Fax: +49.(0)941.78004.489 - www.OneVision.com
  Commerzbank Regensburg - BLZ 750 400 62 - Konto 6011050
  Handelsregister: HRA 6744, Amtsgericht Regensburg
  Komplementärin: OneVision Software Entwicklungs Verwaltungs GmbH
  Dr.-Leo-Ritter-Straße 9 – 93049 Regensburg
  Handelsregister: HRB 8932, Amtsgericht Regensburg - Geschäftsführer: 
Ulrike Döhler, Manuela Kluger

[-- Attachment #2: pr4987.txt --]
[-- Type: text/plain, Size: 716 bytes --]

Index: src/binutils/resrc.c
===================================================================
--- src.orig/binutils/resrc.c
+++ src/binutils/resrc.c
@@ -436,6 +436,9 @@ read_rc_file (const char *filename, cons
   char *cmd;
   const char *fnquotes = (filename_need_quotes (filename) ? "\"" : "");
 
+  if (filename == NULL)
+    filename = "-";
+
   /* Setup the default resource import path taken from input file.  */
   if (strchr (filename, '/') != NULL || strchr (filename, '\\') != NULL)
     {
@@ -469,8 +472,6 @@ read_rc_file (const char *filename, cons
 
   if (preprocargs == NULL)
     preprocargs = "";
-  if (filename == NULL)
-    filename = "-";
 
   if (preprocessor)
     {
=

Re: [PING patch]: PR/4987: windres does not get stdin input file

[Christopher Faylor]

On Mon, Sep 24, 2007 at 11:33:13AM +0200, Kai Tietz wrote:
>This fix is obvious.  A missing check for nil filename leads to
>segmentation fault.  I tested this patch for cygwin and linux
>environment.
>
>ChangeLog:
>
>2007-09-11      Alon Bar-Lev  <alon.barlev@gmail.com>
>
>        * resrc.c: (read_rc_file): Move 'filename' default initialization in
>        front to function begin.

Looks good.  Please check in.

cgf

Re: [PING patch]: PR/4987: windres does not get stdin input file

[Kai Tietz]

> On Mon, Sep 24, 2007 at 11:33:13AM +0200, Kai Tietz wrote:
> >This fix is obvious.  A missing check for nil filename leads to
> >segmentation fault.  I tested this patch for cygwin and linux
> >environment.
> >
> >ChangeLog:
> >
> >2007-09-11      Alon Bar-Lev  <alon.barlev@gmail.com>
> >
> >        * resrc.c: (read_rc_file): Move 'filename' default 
initialization in
> >        front to function begin.
> 
> Looks good.  Please check in.

Was allready done. Somebody missed to sent a e-mail for this or did I 
missed it ?

Thanks,
 i.A. Kai Tietz

|  (\_/)  This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| (")_(") world domination.

------------------------------------------------------------------------------------------
  OneVision Software Entwicklungs GmbH & Co. KG
  Dr.-Leo-Ritter-Straße 9 - 93049 Regensburg
  Tel: +49.(0)941.78004.0 - Fax: +49.(0)941.78004.489 - www.OneVision.com
  Commerzbank Regensburg - BLZ 750 400 62 - Konto 6011050
  Handelsregister: HRA 6744, Amtsgericht Regensburg
  Komplementärin: OneVision Software Entwicklungs Verwaltungs GmbH
  Dr.-Leo-Ritter-Straße 9 – 93049 Regensburg
  Handelsregister: HRB 8932, Amtsgericht Regensburg - Geschäftsführer: 
Ulrike Döhler, Manuela Kluger

Re: [PING patch]: PR/4987: windres does not get stdin input file

[Nick Clifton]

Hi Kai,

> Was allready done. Somebody missed to sent a e-mail for this or did I 
> missed it ?

I checked it in.  I thought that I had sent an email out saying so as well, but 
maybe I forgot.  Please accept my apologies.

Cheers
   Nick