components/bash/patches/bash44-002.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Thu, 26 Jan 2017 12:24:45 +0100
branchs11u3-sru
changeset 7627 4758b76d5ad5
permissions -rw-r--r--
25123965 Update bash to version 4.4 24689447 problem in UTILITY/BASH 21341453 process hangs when terminated with unfinished command 21196056 bash test is failing to finish 19394218 bash : Parameter Substitution Causing Memory Leak
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7627
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     1
			     BASH PATCH REPORT
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     2
			     =================
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     3
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     4
Bash-Release:	4.4
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     5
Patch-ID:	bash44-002
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     6
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     7
Bug-Reported-by:	Eric Pruitt <[email protected]>
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     8
Bug-Reference-ID:	<[email protected]>
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     9
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    10
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    11
Bug-Description:
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    12
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    13
Bash-4.4 warns when discarding NUL bytes in command substitution output
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    14
instead of silently dropping them.  This patch changes the warnings from
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    15
one per NUL byte encountered to one warning per command substitution.
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    16
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    17
Patch (apply with `patch -p0'):
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    18
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    19
*** ../bash-4.4/subst.c	2016-08-30 16:46:38.000000000 -0400
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    20
--- subst.c	2016-09-26 10:20:19.000000000 -0400
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    21
***************
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    22
*** 5932,5935 ****
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    23
--- 5933,5937 ----
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    24
    int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    25
    ssize_t bufn;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    26
+   int nullbyte;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    27
  
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    28
    istring = (char *)NULL;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    29
***************
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    30
*** 5939,5942 ****
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    31
--- 5941,5946 ----
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    32
      skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    33
  
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    34
+   nullbyte = 0;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    35
+ 
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    36
    /* Read the output of the command through the pipe.  This may need to be
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    37
       changed to understand multibyte characters in the future. */
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    38
***************
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    39
*** 5957,5961 ****
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    40
  	{
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    41
  #if 1
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    42
! 	  internal_warning ("%s", _("command substitution: ignored null byte in input"));
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    43
  #endif
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    44
  	  continue;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    45
--- 5961,5969 ----
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    46
  	{
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    47
  #if 1
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    48
! 	  if (nullbyte == 0)
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    49
! 	    {
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    50
! 	      internal_warning ("%s", _("command substitution: ignored null byte in input"));
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    51
! 	      nullbyte = 1;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    52
! 	    }
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    53
  #endif
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    54
  	  continue;
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    55
*** ../bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    56
--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    57
***************
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    58
*** 26,30 ****
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    59
     looks for to find the patch level (for the sccs version string). */
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    60
  
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    61
! #define PATCHLEVEL 1
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    62
  
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    63
  #endif /* _PATCHLEVEL_H_ */
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    64
--- 26,30 ----
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    65
     looks for to find the patch level (for the sccs version string). */
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    66
  
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    67
! #define PATCHLEVEL 2
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    68
  
4758b76d5ad5 25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    69
  #endif /* _PATCHLEVEL_H_ */