components/bash/patches/bash41-012.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 17 Jun 2015 11:14:40 -0700
branchs11-update
changeset 4496 1a405bbe5189
parent 3462 3fbdd7a202d6
permissions -rw-r--r--
Close of build 25.3.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3462
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     1
			     BASH PATCH REPORT
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     2
			     =================
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     3
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     4
Bash-Release:	4.1
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
Patch-ID:	bash41-012
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     7
Bug-Reported-by:	Stephane Chazelas <[email protected]>
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
Bug-Reference-ID:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     9
Bug-Reference-URL:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
Bug-Description:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
Under certain circumstances, bash will execute user code while processing the
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
environment for exported function definitions.
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
Patch (apply with `patch -p0'):
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    18
*** ../bash-4.1.11/builtins/common.h	2009-12-22 16:30:42.000000000 -0500
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
--- builtins/common.h	2014-09-16 19:27:38.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
*** 36,39 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
--- 36,41 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
  /* Flags for describe_command, shared between type.def and command.def */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
+ #define SEVAL_FUNCDEF	0x080		/* only allow function definitions */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
+ #define SEVAL_ONECMD	0x100		/* only allow a single command */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    27
  #define CDESC_ALL		0x001	/* type -a */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
  #define CDESC_SHORTDESC		0x002	/* command -V */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
*** ../bash-4.1.11/builtins/evalstring.c	2009-10-17 21:18:50.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
--- builtins/evalstring.c	2014-09-16 19:27:38.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
*** 262,265 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
--- 262,273 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
  	      struct fd_bitmap *bitmap;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    36
+ 	      if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
+ 		{
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    38
+ 		  internal_warning ("%s: ignoring function definition attempt", from_file);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    39
+ 		  should_jump_to_top_level = 0;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    40
+ 		  last_result = last_command_exit_value = EX_BADUSAGE;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    41
+ 		  break;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    42
+ 		}
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    43
+ 
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    44
  	      bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    45
  	      begin_unwind_frame ("pe_dispose");
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    46
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    47
*** 322,325 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    48
--- 330,336 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    49
  	      dispose_fd_bitmap (bitmap);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    50
  	      discard_unwind_frame ("pe_dispose");
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    51
+ 
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    52
+ 	      if (flags & SEVAL_ONECMD)
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    53
+ 		break;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    54
  	    }
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    55
  	}
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    56
*** ../bash-4.1.11/variables.c	2010-03-26 12:15:39.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    57
--- variables.c	2014-09-16 19:27:38.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    58
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    59
*** 348,357 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    60
  	  strcpy (temp_string + char_index + 1, string);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    61
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    62
! 	  parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    63
! 
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    64
! 	  /* Ancient backwards compatibility.  Old versions of bash exported
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    65
! 	     functions like name()=() {...} */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    66
! 	  if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    67
! 	    name[char_index - 2] = '\0';
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    68
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    69
  	  if (temp_var = find_function (name))
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    70
--- 348,355 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    71
  	  strcpy (temp_string + char_index + 1, string);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    72
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    73
! 	  /* Don't import function names that are invalid identifiers from the
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    74
! 	     environment. */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    75
! 	  if (legal_identifier (name))
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    76
! 	    parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    77
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    78
  	  if (temp_var = find_function (name))
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    79
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    80
*** 362,369 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    81
  	  else
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    82
  	    report_error (_("error importing function definition for `%s'"), name);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    83
- 
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    84
- 	  /* ( */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    85
- 	  if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    86
- 	    name[char_index - 2] = '(';		/* ) */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    87
  	}
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    88
  #if defined (ARRAY_VARS)
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    89
--- 360,363 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    90
*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    91
--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    92
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    93
*** 26,30 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    94
     looks for to find the patch level (for the sccs version string). */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    95
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    96
! #define PATCHLEVEL 11
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    97
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    98
  #endif /* _PATCHLEVEL_H_ */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    99
--- 26,30 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   100
     looks for to find the patch level (for the sccs version string). */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   101
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   102
! #define PATCHLEVEL 12
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   103
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   104
  #endif /* _PATCHLEVEL_H_ */