tags 700914 +pending -moreinfo thanks Ok, good. I have tested the patch, it works and fixes the issue. The diff is not so large, as it seemed (attached).
@Andreas, I have uploaded 3.0-29 version in DELAYED/7. Please, feel free to cancel that, if you are not agree. Thanks, Anton On 02/26/2013 08:24 AM, YunQiang Su wrote: > This bug make a quite import function unusable. > So think it is RC. >
diff -Nru wordnet-3.0/debian/changelog wordnet-3.0/debian/changelog
--- wordnet-3.0/debian/changelog 2012-06-06 08:24:55.000000000 +0200
+++ wordnet-3.0/debian/changelog 2013-02-26 20:41:35.000000000 +0100
@@ -1,3 +1,11 @@
+wordnet (1:3.0-29) unstable; urgency=low
+
+ * Team upload.
+ * Fix index processing error in morphstr() function.
+ Closes: #700914
+
+ -- Anton Gladky <gl...@debian.org> Tue, 26 Feb 2013 20:40:25 +0100
+
wordnet (1:3.0-28) unstable; urgency=low
* debian/dict-wn.post{inst,rm}: verify start script using
diff -Nru wordnet-3.0/debian/patches/51_overflows.patch
wordnet-3.0/debian/patches/51_overflows.patch
--- wordnet-3.0/debian/patches/51_overflows.patch 2009-04-09
10:01:11.000000000 +0200
+++ wordnet-3.0/debian/patches/51_overflows.patch 2013-02-24
19:41:06.000000000 +0100
@@ -8,8 +8,10 @@
set and is moved to 51_overflows_memcpy.patch which
uses memcpy instead of the formerly used strcpy.
---- WordNet-3.0.orig/lib/binsrch.c
-+++ WordNet-3.0/lib/binsrch.c
+Index: wordnet-3.0/lib/binsrch.c
+===================================================================
+--- wordnet-3.0.orig/lib/binsrch.c 2013-02-19 16:03:01.698031603 +0800
++++ wordnet-3.0/lib/binsrch.c 2013-02-19 16:03:01.686031603 +0800
@@ -28,7 +28,7 @@
char *linep;
@@ -46,9 +48,11 @@
strncpy(key, linep, length);
key[length] = '\0';
if(strcmp(key, searchkey) < 0) { /* further in file */
---- WordNet-3.0.orig/lib/morph.c
-+++ WordNet-3.0/lib/morph.c
-@@ -51,24 +51,24 @@
+Index: wordnet-3.0/lib/morph.c
+===================================================================
+--- wordnet-3.0.orig/lib/morph.c 2013-02-19 16:03:01.698031603 +0800
++++ wordnet-3.0/lib/morph.c 2013-02-19 16:06:14.850029761 +0800
+@@ -51,21 +51,21 @@
char *str;
int strlen;
} prepositions[NUMPREPS] = {
@@ -84,20 +88,7 @@
+ { "between", 7 }
};
--static FILE *exc_fps[NUMPARTS + 1];
-+static FILE *exc_fps[NUMPARTS];
-
- static int do_init();
- static int strend(char *, char *);
-@@ -100,7 +100,7 @@
- {
- int i;
-
-- for (i = 1; i <= NUMPARTS; i++) {
-+ for (i = 0; i < NUMPARTS; i++) {
- if (exc_fps[i] != NULL) {
- fclose(exc_fps[i]); exc_fps[i] = NULL;
- }
+ static FILE *exc_fps[NUMPARTS + 1];
@@ -144,18 +144,19 @@
} else
sprintf(searchdir, DEFAULTPATH);
@@ -116,10 +107,9 @@
+ }
#endif
-- for (i = 1; i <= NUMPARTS; i++) {
+ for (i = 1; i <= NUMPARTS; i++) {
- sprintf(fname, EXCFILE, searchdir, partnames[i]);
-+ for (i = 0; i < NUMPARTS; i++) {
-+ snprintf(fname, sizeof(fname), EXCFILE, searchdir, partnames[i+1]);
++ snprintf(fname, sizeof(fname), EXCFILE, searchdir, partnames[i]);
if ((exc_fps[i] = fopen(fname, "r")) == NULL) {
- sprintf(msgbuf,
+ snprintf(msgbuf, sizeof(msgbuf),
@@ -232,8 +222,10 @@
strncpy(end, rest, last - rest + 1);
end[last-rest+1] = '\0';
strcat(end, lastwd);
---- WordNet-3.0.orig/lib/search.c
-+++ WordNet-3.0/lib/search.c
+Index: wordnet-3.0/lib/search.c
+===================================================================
+--- wordnet-3.0.orig/lib/search.c 2013-02-19 16:03:01.698031603 +0800
++++ wordnet-3.0/lib/search.c 2013-02-19 16:03:01.690031603 +0800
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <string.h>
@@ -595,8 +587,10 @@
if (fileinfoflag) {
sprintf(tbuf + strlen(tbuf),"<%s> ", lexfiles[synptr->fnum]);
prlexid = 1;
---- WordNet-3.0.orig/lib/wnutil.c
-+++ WordNet-3.0/lib/wnutil.c
+Index: wordnet-3.0/lib/wnutil.c
+===================================================================
+--- wordnet-3.0.orig/lib/wnutil.c 2013-02-19 16:03:01.698031603 +0800
++++ wordnet-3.0/lib/wnutil.c 2013-02-19 16:03:01.690031603 +0800
@@ -48,7 +48,7 @@
char *env;
@@ -691,8 +685,10 @@
"WordNet library warning: Can't open verb example sentence index file(%s)\n",
tmpbuf);
display_message(msgbuf);
---- WordNet-3.0.orig/src/wn.c
-+++ WordNet-3.0/src/wn.c
+Index: wordnet-3.0/src/wn.c
+===================================================================
+--- wordnet-3.0.orig/src/wn.c 2013-02-19 16:03:01.698031603 +0800
++++ wordnet-3.0/src/wn.c 2013-02-19 16:03:01.690031603 +0800
@@ -131,7 +131,7 @@
printsearches(char *, int, unsigned long);
static int error_message(char *);
diff -Nru wordnet-3.0/debian/upstream wordnet-3.0/debian/upstream
--- wordnet-3.0/debian/upstream 2012-06-01 14:06:06.000000000 +0200
+++ wordnet-3.0/debian/upstream 2013-02-26 20:30:38.000000000 +0100
@@ -13,3 +13,7 @@
Journal: MIT Press
Year: 1998
URL: http://mitpress.mit.edu/catalog/item/default.asp?ttype=2&tid=8106
+ - Author: Christiane Fellbaum
+ Title: WordNet and wordnets
+ Year: 2005
+ In: "Brown, Keith et al. (eds.), Encyclopedia of Language and Linguistics,
Second Edition, Oxford: Elsevier, 665-670"
signature.asc
Description: OpenPGP digital signature
