| 1 |
commit: 3d5e189f8ed0d703a60cf875d306c8eede3f1e9b |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 8 08:59:14 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 8 09:13:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5e189f |
| 7 |
|
| 8 |
app-i18n/canna: fix buffer overflow |
| 9 |
|
| 10 |
Gentoo-Bug: 341185 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
app-i18n/canna/canna-3.7_p3-r1.ebuild | 1 + |
| 15 |
app-i18n/canna/canna-3.7_p3-r2.ebuild | 1 + |
| 16 |
app-i18n/canna/canna-3.7_p3-r3.ebuild | 1 + |
| 17 |
app-i18n/canna/files/canna-overflow.patch | 20 ++++++++++++++++++++ |
| 18 |
4 files changed, 23 insertions(+) |
| 19 |
|
| 20 |
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
| 21 |
index 6a04c297b98..e38caaff6fb 100644 |
| 22 |
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild |
| 23 |
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
| 24 |
@@ -24,6 +24,7 @@ S="${WORKDIR}/${MY_P}" |
| 25 |
PATCHES=( |
| 26 |
"${FILESDIR}"/${PN}-gentoo.patch |
| 27 |
"${FILESDIR}"/${PN}-kpdef.patch |
| 28 |
+ "${FILESDIR}"/${PN}-overflow.patch |
| 29 |
"${FILESDIR}"/${PN}-posix-sort.patch |
| 30 |
"${FILESDIR}"/${PN}-Wformat.patch |
| 31 |
"${FILESDIR}"/${PN}-Wformat-security.patch |
| 32 |
|
| 33 |
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
| 34 |
index f6c43bc73d8..a06d55f21d7 100644 |
| 35 |
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild |
| 36 |
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
| 37 |
@@ -29,6 +29,7 @@ S="${WORKDIR}/${MY_P}" |
| 38 |
PATCHES=( |
| 39 |
"${FILESDIR}"/${PN}-gentoo.patch |
| 40 |
"${FILESDIR}"/${PN}-kpdef.patch |
| 41 |
+ "${FILESDIR}"/${PN}-overflow.patch |
| 42 |
"${FILESDIR}"/${PN}-posix-sort.patch |
| 43 |
"${FILESDIR}"/${PN}-Wformat.patch |
| 44 |
"${FILESDIR}"/${PN}-Wformat-security.patch |
| 45 |
|
| 46 |
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild |
| 47 |
index bb324c8e8ea..8dbf091e2dd 100644 |
| 48 |
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild |
| 49 |
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild |
| 50 |
@@ -35,6 +35,7 @@ PATCHES=( |
| 51 |
"${FILESDIR}"/${PN}-gentoo.patch |
| 52 |
"${FILESDIR}"/${PN}-canuum.patch |
| 53 |
"${FILESDIR}"/${PN}-kpdef.patch |
| 54 |
+ "${FILESDIR}"/${PN}-overflow.patch |
| 55 |
"${FILESDIR}"/${PN}-posix-sort.patch |
| 56 |
"${FILESDIR}"/${PN}-Wformat.patch |
| 57 |
"${FILESDIR}"/${PN}-Wformat-security.patch |
| 58 |
|
| 59 |
diff --git a/app-i18n/canna/files/canna-overflow.patch b/app-i18n/canna/files/canna-overflow.patch |
| 60 |
new file mode 100644 |
| 61 |
index 00000000000..ef3b6ad1b95 |
| 62 |
--- /dev/null |
| 63 |
+++ b/app-i18n/canna/files/canna-overflow.patch |
| 64 |
@@ -0,0 +1,20 @@ |
| 65 |
+--- a/cmd/catdic/rutil.c |
| 66 |
++++ b/cmd/catdic/rutil.c |
| 67 |
+@@ -384,7 +384,7 @@ |
| 68 |
+ (void)fprintf(stderr,gettxt("cannacmd:205", |
| 69 |
+ "Specified dictionary \"%s\" already exists. Do you overwrite it ? (y/n)"), |
| 70 |
+ dicname); |
| 71 |
+- fgets(ans,80,stdin); |
| 72 |
++ fgets(ans,sizeof(ans),stdin); |
| 73 |
+ } else { |
| 74 |
+ (void)fprintf(stderr,gettxt("cannacmd:206", |
| 75 |
+ "Specified dictionary \"%s\" already exists."),dicname); |
| 76 |
+@@ -474,7 +474,7 @@ |
| 77 |
+ if (isatty(fileno(stdin)) != 0) { |
| 78 |
+ (void)fprintf(stderr,gettxt("cannacmd:216", |
| 79 |
+ "Personal learning file of dictionary \"%s\" exists. Do you overwrite it ? (y/n)"),dicname); |
| 80 |
+- fgets(ans,80,stdin); |
| 81 |
++ fgets(ans,sizeof(ans),stdin); |
| 82 |
+ } else { |
| 83 |
+ (void)fprintf(stderr,gettxt("cannacmd:217", |
| 84 |
+ "Personal learning file of system dictionary \"%s\" already exists."), |
Archives