提交: 8f5685cd045a2544f39a1394090737203a5c94c0 - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• 修订版: 8f5685cd045a2544f39a1394090737203a5c94c0 (tree)
• 时间: 2007-05-15 04:55:09
• 作者: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

* mcsource.c (mc_source): Close input_fd' prior to every use of return', when returning abnormally.

更改概述

• modified: ChangeLog
• modified: mcsource.c

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-05-14  Keith Marshall  <[e-mail]>
 
+	* mcsource.c (mc_source): Close `input_fd' prior to every use
+	of `return', when returning abnormally.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Support all escape sequences required by POSIX 1003.1.
 
 	* mcsource.c (OCTAL_SEQUENCE_DECODE): New manifest constant.

--- a/mcsource.c
+++ b/mcsource.c
@@ -9,7 +9,7 @@
  * used internally by `gencat', to compile message dictionaries.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 12-May-2007
+ * Last modification: 14-May-2007
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -255,7 +255,10 @@ struct msgdict *mc_source( const char *input )
 
   dfprintf(( stderr, "\n%s:new source file\n%s:", input, input ));
   if( (messages = mc_malloc( headroom = mc_workspace_wanted( fd ))) == NULL )
+  {
+    close( input_fd );
     return NULL;
+  }
 
   msgloc = (off_t)(0);
   while( (fd >= 0) && ((count = read( fd, buf, sizeof( buf ) )) > 0) )
@@ -490,6 +493,7 @@ struct msgdict *mc_source( const char *input )
                    */
                   dfputc(( '\n', stderr ));
                   gencat_errno = mc_errout( FATAL( MSG_SETNUM_NOT_INCR ), setnum, accumulator );
+		  close( input_fd );
 		  return NULL;
                 }
                 break;
@@ -601,6 +605,7 @@ struct msgdict *mc_source( const char *input )
                    */
                   dfputc(( '\n', stderr ));
                   gencat_errno = mc_errout( FATAL( MSG_MSGNUM_NOT_INCR ), msgnum, accumulator );
+		  close( input_fd );
 		  return NULL;
                 }
                 status |= ( MSGTEXT | ENCODED );
@@ -836,6 +841,7 @@ struct msgdict *mc_source( const char *input )
           if( (messages = realloc( messages, msgloc + headroom )) == NULL )
 	  {
             gencat_errno = mc_errout( FATAL( MSG_OUT_OF_MEMORY ));
+	    close( input_fd );
 	    return NULL;
 	  }
         }