Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/parse.y-CVE-2014-7169.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Thu, 25 Sep 2014 07:38:21 -0700
branchs11u2-sru
changeset 3336 084b9ae629e2
permissions -rw-r--r--
19682871 problem in UTILITY/BASH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3336
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Patch is from Chet Ramey (Bash Project Lead);
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# http://www.openwall.com/lists/oss-security/2014/09/25/10
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# This will become an official bash patch.
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
*** ../bash-20140912/parse.y	2014-08-26 15:09:42.000000000 -0400
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
--- parse.y	2014-09-24 22:47:28.000000000 -0400
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
***************
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
*** 2959,2962 ****
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
--- 2959,2964 ----
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
    word_desc_to_read = (WORD_DESC *)NULL;
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+   eol_ungetc_lookahead = 0;
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
    current_token = '\n';		/* XXX */
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
    last_read_token = '\n';
084b9ae629e2 19682871 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 














upstream/oracle/userland-gate