Imported from ../bash-2.05.tar.gz.

[platform/upstream/bash.git] / builtins / evalfile.c

diff --git a/builtins/evalfile.c b/builtins/evalfile.c
index 3ffccbe..1116b09 100644 (file)
--- a/builtins/evalfile.c
+++ b/builtins/evalfile.c
@@ -4,7 +4,7 @@
 
    Bash is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 1, or (at your option) any later
+   Software Foundation; either version 2, or (at your option) any later
    version.
 
    Bash is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -14,7 +14,7 @@
    
    You should have received a copy of the GNU General Public License along
    with Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #include <config.h>
 
@@ -23,8 +23,8 @@
 #endif
 
 #include "../bashtypes.h"
-#include "../posixstat.h"
-#include "../filecntl.h"
+#include "posixstat.h"
+#include "filecntl.h"
 
 #include <stdio.h>
 #include <signal.h>
@@ -56,6 +56,7 @@ extern int errno;
 #define FEVAL_NONINT           0x008
 #define FEVAL_LONGJMP          0x010
 #define FEVAL_HISTORY          0x020
+#define FEVAL_CHECKBINARY      0x040
 
 extern int interactive, interactive_shell, posixly_correct;
 extern int indirection_level, startup_state, subshell_environment;
@@ -75,6 +76,7 @@ _evalfile (filename, flags)
   int return_val, fd, result, pflags;
   char *string;
   struct stat finfo;
+  size_t file_size;
   VFunction *errfunc;
 
   fd = open (filename, O_RDONLY);
@@ -86,7 +88,7 @@ file_error_and_exit:
        file_error (filename);
 
       if (flags & FEVAL_LONGJMP)
-        {
+       {
          last_command_exit_value = 1;
          jump_to_top_level (EXITPROG);
        }
@@ -108,21 +110,40 @@ file_error_and_exit:
       return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
     }
 
-  string = xmalloc (1 + (int)finfo.st_size);
-  result = read (fd, string, finfo.st_size);
+  file_size = (size_t)finfo.st_size;
+  /* Check for overflow with large files. */
+  if (file_size != finfo.st_size || file_size + 1 < file_size)
+    {
+      (*errfunc) ("%s: file is too large", filename);
+      return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
+    }      
+
+#if defined (__CYGWIN__) && defined (O_TEXT)
+  setmode (fd, O_TEXT);
+#endif
+
+  string = xmalloc (1 + file_size);
+  result = read (fd, string, file_size);
   string[result] = '\0';
 
   return_val = errno;
   close (fd);
   errno = return_val;
 
-  if (result != (int)finfo.st_size)
+  if (result < 0)              /* XXX was != file_size, not < 0 */
     {
       free (string);
       goto file_error_and_exit;
     }
 
-  if (check_binary_file ((unsigned char *)string, (result > 80) ? 80 : result))
+  if (result == 0)
+    {
+      free (string);
+      return ((flags & FEVAL_BUILTIN) ? EXECUTION_SUCCESS : 1);
+    }
+      
+  if ((flags & FEVAL_CHECKBINARY) && 
+      check_binary_file ((unsigned char *)string, (result > 80) ? 80 : result))
     {
       free (string);
       (*errfunc) ("%s: cannot execute binary file", filename);