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/ksh93/patches/17824699.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Mon, 17 Feb 2014 11:00:49 +0100
branchs11u1-sru
changeset 2954 33df57f08b3e
permissions -rw-r--r--
17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1) 17435456 setting KSH_VERSION crashes ksh93
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2954
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     1
 
http://lists.research.att.com/pipermail/ast-developers/2014q1/003807.html
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     2
 
---
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     3
 
diff --git a/src/cmd/ksh93/edit/edit.c b/src/cmd/ksh93/edit/edit.c
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     4
 
index 769ba2e..4f6330e 100644
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     5
 
--- a/src/cmd/ksh93/edit/edit.c
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     6
 
+++ b/src/cmd/ksh93/edit/edit.c
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     7
 
@@ -651,7 +651,8 @@ void	ed_setup(register Edit_t *ep, int fd, int reedit)
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     8
 
 			{
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     9
 
 				int skip=0;
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    10
 
 				ep->e_crlf = 0;
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    11
 
-				*pp++ = c;
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    12
 
+				if (pp < ppmax)
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    13
 
+					*pp++ = c;
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    14
 
 				for(n=1; c = *last++; n++)
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    15
 
 				{
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    16
 
 					if(pp < ppmax)
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    17
 
diff --git a/src/cmd/ksh93/include/edit.h b/src/cmd/ksh93/include/edit.h
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    18
 
index 795777d..145066d 100644
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    19
 
--- a/src/cmd/ksh93/include/edit.h
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    20
 
+++ b/src/cmd/ksh93/include/edit.h
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    21
 
@@ -59,7 +59,7 @@
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    22
 
 #endif /* SHOPT_MULTIBYTE */
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    23
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    24
 
 #define TABSIZE	8
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    25
 
-#define PRSIZE	160
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    26
 
+#define PRSIZE	256
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    27
 
 #define MAXLINE	1024		/* longest edit line permitted */
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    28
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    29
 
 typedef struct _edit_pos
33df57f08b3e 17824699 ksh93 coredumps in ed_emacsread() when changing prompt string (PS1)
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    30
 














upstream/oracle/userland-gate