blob: 4776c3cab7f41ed6f91f695cffa7ee9b81ec0568 (
plain) (
blame)
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
|
$FreeBSD$
--- src/ptclib/asner.cxx 2004/06/03 14:44:43 1.1
+++ src/ptclib/asner.cxx 2004/06/03 14:50:35
@@ -4926,6 +4926,11 @@
return -1;
value += lower;
+
+ // clamp value to upper limit
+ if (value > upper)
+ value = upper;
+
return 0;
}
@@ -4970,7 +4975,13 @@
unsigned base;
if (!MultiBitDecode(CountBits(upper - lower + 1), base))
return -1;
- return lower + base; // 10.9.4.1
+ len = lower + base; // 10.9.4.1
+
+ // clamp value to upper limit
+ if (len > upper)
+ len = upper;
+
+ return len;
}
if (upper < 65536) // 10.9.3.3
@@ -4981,13 +4992,20 @@
if (IsAtEnd())
return -1;
- if (SingleBitDecode() == 0)
- return MultiBitDecode(7, len) ? 0 : -1; // 10.9.3.6
+ if (SingleBitDecode() == 0) {
+ if (!MultiBitDecode(7, len)) // 10.9.3.6
+ return -1; // 10.9.3.8 unsupported
+ }
+ else if (SingleBitDecode() == 0) {
+ if (!MultiBitDecode(14, len)) // 10.9.3.7
+ return -1; // 10.9.3.8 unsupported
+ }
- if (SingleBitDecode() == 0)
- return MultiBitDecode(14, len) ? 0 : -1; // 10.9.3.7
+ // clamp value to upper limit
+ if (len > upper)
+ len = upper;
- return -1; // 10.9.3.8 unsupported
+ return 0;
}
|
