components/bash/patches/bash44-006.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Mon, 23 Jan 2017 10:16:25 +0100
changeset 7611 75e376a3da00
child 7612 b9fb75ff5a92
permissions -rw-r--r--
25435207 Apply bash patches 6-11
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7611
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     1
			     BASH PATCH REPORT
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     2
			     =================
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     3
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     4
Bash-Release:	4.4
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     5
Patch-ID:	bash44-006
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     6
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     7
Bug-Reported-by:	<[email protected]>
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     8
Bug-Reference-ID:	<CAEr-gPFPvqheiAeENmMkEwWRd4U=1iqCsYmR3sLdULOqL++_tQ@mail.gmail.com>
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     9
Bug-Reference-URL:	
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    10
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    11
Bug-Description:
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    12
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    13
Out-of-range negative offsets to popd can cause the shell to crash attempting
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    14
to free an invalid memory block.
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    15
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    16
Patch (apply with `patch -p0'):
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    17
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    18
*** ../bash-4.4-patched/builtins/pushd.def	2016-01-25 13:31:49.000000000 -0500
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    19
--- builtins/pushd.def	2016-10-28 10:46:49.000000000 -0400
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    20
***************
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    21
*** 366,370 ****
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    22
      }
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    23
  
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    24
!   if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    25
      {
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    26
        pushd_error (directory_list_offset, which_word ? which_word : "");
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    27
--- 366,370 ----
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    28
      }
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    29
  
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    30
!   if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    31
      {
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    32
        pushd_error (directory_list_offset, which_word ? which_word : "");
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    33
***************
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    34
*** 388,391 ****
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    35
--- 388,396 ----
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    36
  	 of the list into place. */
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    37
        i = (direction == '+') ? directory_list_offset - which : which;
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    38
+       if (i < 0 || i > directory_list_offset)
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    39
+ 	{
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    40
+ 	  pushd_error (directory_list_offset, which_word ? which_word : "");
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    41
+ 	  return (EXECUTION_FAILURE);
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    42
+ 	}
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    43
        free (pushd_directory_list[i]);
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    44
        directory_list_offset--;
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    45
*** ../bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    46
--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    47
***************
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    48
*** 26,30 ****
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    49
     looks for to find the patch level (for the sccs version string). */
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    50
  
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    51
! #define PATCHLEVEL 5
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    52
  
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    53
  #endif /* _PATCHLEVEL_H_ */
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    54
--- 26,30 ----
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    55
     looks for to find the patch level (for the sccs version string). */
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    56
  
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    57
! #define PATCHLEVEL 6
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    58
  
75e376a3da00 25435207 Apply bash patches 6-11
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    59
  #endif /* _PATCHLEVEL_H_ */