| author | James Chang <james.c.chang@Oracle.COM> |
| Mon, 16 Mar 2015 10:28:40 -0700 | |
| branch | s11-update |
| changeset 3952 | 746ec6382a1f |
| permissions | -rw-r--r-- |
|
3952
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
1 |
# Patch origin: internal |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
2 |
# buffer overflow in info in get_manpage_node() |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
3 |
# Sent to and incorporated into upstream |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
4 |
|
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
5 |
--- texinfo-4.13/info/man.c Sat Jul 5 16:32:19 2008 |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ texinfo-4.13/info/man.c Tue Mar 3 15:02:03 2015 |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -83,7 +83,7 @@ |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
8 |
int hlen, plen; |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
9 |
char *old_contents = file_buffer->contents; |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
10 |
|
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
11 |
- sprintf (header, "\n\n%c\n%s %s, %s %s, %s (dir)\n\n", |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
12 |
+ snprintf (header, sizeof(header), "\n\n%c\n%s %s, %s %s, %s (dir)\n\n", |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
13 |
INFO_COOKIE, |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
14 |
INFO_FILE_LABEL, file_buffer->filename, |
|
746ec6382a1f
20570467 buffer overflow in info in get_manpage_node()
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
15 |
INFO_NODE_LABEL, pagename, |