diff options
| author | hrs <hrs@FreeBSD.org> | 2011-07-02 21:15:39 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-07-02 21:15:39 +0800 |
| commit | 24f05c87f38dd3ee69af12bd183d7cc47c567539 (patch) | |
| tree | 4fb15c324fb81e7f5875648ce6ad2ea73b3b7a77 | |
| parent | c19bb2b927bbccc654f2c05ca828b0b79af836f2 (diff) | |
| download | freebsd-ports-gnome-24f05c87f38dd3ee69af12bd183d7cc47c567539.tar.gz freebsd-ports-gnome-24f05c87f38dd3ee69af12bd183d7cc47c567539.tar.zst freebsd-ports-gnome-24f05c87f38dd3ee69af12bd183d7cc47c567539.zip | |
Ignore entries in an SKK dictionary that start with ">". This should fix an
insta-crash issue.
| -rw-r--r-- | japanese/skkserv/Makefile | 2 | ||||
| -rw-r--r-- | japanese/skkserv/files/patch-skkserv.c | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile index 457013a63ace..f215cc4e1a84 100644 --- a/japanese/skkserv/Makefile +++ b/japanese/skkserv/Makefile @@ -7,7 +7,7 @@ PORTNAME= skkserv PORTVERSION= 9.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_PORTS_JP} DISTNAME= skk${PORTVERSION} diff --git a/japanese/skkserv/files/patch-skkserv.c b/japanese/skkserv/files/patch-skkserv.c index 0983a5d31cbb..92b3ad6e203a 100644 --- a/japanese/skkserv/files/patch-skkserv.c +++ b/japanese/skkserv/files/patch-skkserv.c @@ -1,5 +1,5 @@ --- skkserv/skkserv.c.orig 1997-01-21 04:16:36.000000000 +0900 -+++ skkserv/skkserv.c 2008-11-02 00:07:53.000000000 +0900 ++++ skkserv/skkserv.c 2011-07-02 22:05:16.000000000 +0900 @@ -124,6 +124,8 @@ int clientsock[MAXCLNT]; /* socket for each client */ int nclients; /* max index for active clients */ @@ -57,7 +57,18 @@ if (portnum == 0) { #ifdef PORTNUM portnum = PORTNUM; -@@ -476,7 +498,7 @@ +@@ -382,6 +404,10 @@ + code = KANA_END; + + while ((c = fgetc(jisho)) != EOF) { ++ if (c == '>') { ++ fgets(buf, BUFSIZE, jisho); ++ continue; ++ } + target = ((c & 0xff)<< 8) | (fgetc(jisho) & 0xff); + if (target == STRMARK) { + fgets(buf, BUFSIZE, jisho); +@@ -476,7 +502,7 @@ if (FD_ISSET(initsock, &readfds)) { len = sizeof(from); |