1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
--- misc/hunspell-1.3.2/src/hunspell/affixmgr.cxx 2010-02-27 12:59:53.000000000 +0100
+++ misc/build/hunspell-1.3.2/src/hunspell/affixmgr.cxx 2011-05-18 16:29:45.919141893 +0200
@@ -6,6 +6,8 @@
#include <stdio.h>
#include <ctype.h>
+#include <limits>
+
#include <vector>
#include "affixmgr.hxx"
@@ -4000,7 +4002,10 @@
case 3: {
np++;
numents = atoi(piece);
- if (numents == 0) {
+ if ((numents <= 0) ||
+ ((::std::numeric_limits<size_t>::max()
+ / sizeof(struct affentry)) < numents))
+ {
char * err = pHMgr->encode_flag(aflag);
if (err) {
HUNSPELL_WARNING(stderr, "error: line %d: bad entry number\n",
--- misc/hunspell-1.3.2/src/tools/munch.c 2010-02-27 21:49:49.000000000 +0100
+++ misc/build/hunspell-1.3.2/src/tools/munch.c 2011-05-18 15:53:53.427072106 +0200
@@ -4,6 +4,7 @@
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
+#include <stdint.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -233,10 +233,19 @@
case 1: { achar = *piece; break; }
case 2: { if (*piece == 'Y') ff = XPRODUCT; break; }
case 3: { numents = atoi(piece);
- ptr = malloc(numents * sizeof(struct affent));
- ptr->achar = achar;
- ptr->xpflg = ff;
- fprintf(stderr,"parsing %c entries %d\n",achar,numents);
+ if ((numents < 0) ||
+ ((SIZE_MAX/sizeof(struct affent)) < numents))
+ {
+ fprintf(stderr,
+ "Error: too many entries: %d\n", numents);
+ numents = 0;
+ } else {
+ ptr = malloc(numents * sizeof(struct affent));
+ ptr->achar = achar;
+ ptr->xpflg = ff;
+ fprintf(stderr,"parsing %c entries %d\n",
+ achar,numents);
+ }
break;
}
default: break;
--- misc/hunspell-1.3.2/src/tools/unmunch.c 2010-02-23 15:53:29.000000000 +0100
+++ misc/build/hunspell-1.3.2/src/tools/unmunch.c 2011-05-18 20:53:43.843599726 +0200
@@ -6,6 +6,7 @@
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
+#include <stdint.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -158,10 +159,19 @@
case 1: { achar = *piece; break; }
case 2: { if (*piece == 'Y') ff = XPRODUCT; break; }
case 3: { numents = atoi(piece);
- ptr = malloc(numents * sizeof(struct affent));
- ptr->achar = achar;
- ptr->xpflg = ff;
- fprintf(stderr,"parsing %c entries %d\n",achar,numents);
+ if ((numents < 0) ||
+ ((SIZE_MAX/sizeof(struct affent)) < numents))
+ {
+ fprintf(stderr,
+ "Error: too many entries: %d\n", numents);
+ numents = 0;
+ } else {
+ ptr = malloc(numents * sizeof(struct affent));
+ ptr->achar = achar;
+ ptr->xpflg = ff;
+ fprintf(stderr,"parsing %c entries %d\n",
+ achar,numents);
+ }
break;
}
default: break;
|
