components/bash/patches/bash41-016.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Tue, 11 Nov 2014 14:04:02 -0800
branchs11-update
changeset 3462 3fbdd7a202d6
permissions -rw-r--r--
19701904 problem in UTILITY/BASH
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-016
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:	Michal Zalewski <[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
When bash is parsing a function definition that contains a here-document
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
delimited by end-of-file (or end-of-string), it leaves the closing delimiter
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
uninitialized.  This can result in an invalid memory access when the parsed
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
function is later copied.
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
Patch (apply with `patch -p0'):
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
*** ../bash-4.1.15/make_cmd.c	2009-09-11 17:26:12.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
--- make_cmd.c	2014-10-02 11:29:35.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
*** 690,693 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
--- 690,694 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
    temp->redirector = source;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
    temp->redirectee = dest_and_filename;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    27
+   temp->here_doc_eof = 0;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
    temp->instruction = instruction;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
    temp->flags = 0;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
*** ../bash-4.1.15/copy_cmd.c	2009-09-11 16:28:02.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
--- copy_cmd.c	2014-10-02 11:29:35.000000000 -0400
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
*** 127,131 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
      case r_reading_until:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
      case r_deblank_reading_until:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    36
!       new_redirect->here_doc_eof = savestring (redirect->here_doc_eof);
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
        /*FALLTHROUGH*/
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    38
      case r_reading_string:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    39
--- 127,131 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    40
      case r_reading_until:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    41
      case r_deblank_reading_until:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    42
!       new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0;
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    43
        /*FALLTHROUGH*/
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    44
      case r_reading_string:
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    45
*** ../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
    46
--- 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
    47
***************
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    48
*** 26,30 ****
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    49
     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
    50
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    51
! #define PATCHLEVEL 15
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    52
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    53
  #endif /* _PATCHLEVEL_H_ */
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    54
--- 26,30 ----
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    55
     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
    56
  
3fbdd7a202d6 19701904 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    57
! #define PATCHLEVEL 16
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
  #endif /* _PATCHLEVEL_H_ */