Sun Oct 25 12:17:36 2015 UTC ()
Pull upstream fix to avoid libcanna crash triggered by set-key command.
Reported by Takeshi Nakayama in PR pkg/50368.
Also update comment in patch-lib_RK_ncache.c to mention about
the upstream fix in the same commit.
Bump PKGREVISION.
(tsutsui)
diff -r1.12 -r1.13 pkgsrc/inputmethod/canna/distinfo
diff -r1.15 -r1.16 pkgsrc/inputmethod/canna-lib/Makefile
diff -r1.1 -r1.2 pkgsrc/inputmethod/canna/patches/patch-lib_RK_ncache.c
diff -r0 -r1.1 pkgsrc/inputmethod/canna/patches/patch-lib_canna_keydef.c
--- pkgsrc/inputmethod/canna/distinfo 2015/10/18 03:58:31 1.12
+++ pkgsrc/inputmethod/canna/distinfo 2015/10/25 12:17:36 1.13
--- pkgsrc/inputmethod/canna-lib/Makefile 2015/10/18 03:58:31 1.15
+++ pkgsrc/inputmethod/canna-lib/Makefile 2015/10/25 12:17:36 1.16
--- pkgsrc/inputmethod/canna/patches/patch-lib_RK_ncache.c 2015/10/18 03:58:31 1.1
+++ pkgsrc/inputmethod/canna/patches/patch-lib_RK_ncache.c 2015/10/25 12:17:36 1.2
$NetBSD: patch-lib_canna_keydef.c,v 1.1 2015/10/25 12:17:36 tsutsui Exp $
Pull upstream fix to avoid crash on set-key in ~/.canna (PR pkg/50368).
https://osdn.jp/cvs/view/canna/canna/lib/canna/keydef.c?view=log#rev1.3
--- lib/canna/keydef.c.orig 2003-09-17 08:50:53.000000000 +0000
+++ lib/canna/keydef.c
@@ -444,12 +444,9 @@ static unsigned int
createHashKey(data1, data2, which_seq)
unsigned char *data1;
unsigned char data2;
-int which_seq;
+unsigned int which_seq;
{
- unsigned int hashKey;
-
- hashKey = (int)(((POINTERINT)data1 + (POINTERINT)data2) % which_seq);
- return hashKey;
+ return (unsigned int)(((canna_uintptr_t)data1 + (canna_uintptr_t)data2) % which_seq);
}
/* 機能シーケンスを割り出す */