blob: 6c5048232d394a02b0816ea63be78b1b22a7d1a5 (
plain)
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
|
diff -Naur brlcad-7.32.4/src/other/stepcode/src/clstepcore/complexSupport.h brlcad-7.32.4.patched/src/other/stepcode/src/clstepcore/complexSupport.h
--- brlcad-7.32.4/src/other/stepcode/src/clstepcore/complexSupport.h 2021-07-28 23:11:47.000000000 -0400
+++ brlcad-7.32.4.patched/src/other/stepcode/src/clstepcore/complexSupport.h 2022-02-25 17:42:27.909342186 -0500
@@ -208,26 +208,26 @@
// but all we need.
EntList * firstNot( JoinType );
EntList * nextNot( JoinType j ) {
- return next->firstNot( j );
+ return (next) ? next->firstNot(j) : NULL;
}
EntList * firstWanted( MatchType );
EntList * nextWanted( MatchType mat ) {
- return next->firstWanted( mat );
+ return (next) ? next->firstWanted(mat) : NULL;
}
EntList * lastNot( JoinType );
EntList * prevNot( JoinType j ) {
- return prev->lastNot( j );
+ return (prev) ? prev->lastNot(j) : NULL;
}
EntList * lastWanted( MatchType );
EntList * prevWanted( MatchType mat ) {
- return prev->lastWanted( mat );
+ return (prev) ? prev->lastWanted(mat) : NULL;
}
JoinType join;
int multiple() {
return ( join != SIMPLE );
}
- EntList * next, *prev;
+ EntList * next = NULL, *prev = NULL;
protected:
MatchType viable;
diff -Naur brlcad-7.32.4/src/other/stepcode/src/exp2cxx/complexSupport.h brlcad-7.32.4.patched/src/other/stepcode/src/exp2cxx/complexSupport.h
--- brlcad-7.32.4/src/other/stepcode/src/exp2cxx/complexSupport.h 2021-07-28 23:11:48.000000000 -0400
+++ brlcad-7.32.4.patched/src/other/stepcode/src/exp2cxx/complexSupport.h 2022-02-25 17:40:52.465760163 -0500
@@ -162,26 +162,26 @@
// but all we need.
EntList * firstNot( JoinType );
EntList * nextNot( JoinType j ) {
- return next->firstNot( j );
+ return (next) ? next->firstNot(j) : NULL;
}
EntList * firstWanted( MatchType );
EntList * nextWanted( MatchType mat ) {
- return next->firstWanted( mat );
+ return (next) ? next->firstWanted(mat) : NULL;
}
EntList * lastNot( JoinType );
EntList * prevNot( JoinType j ) {
- return prev->lastNot( j );
+ return (prev) ? prev->lastNot(j) : NULL;
}
EntList * lastWanted( MatchType );
EntList * prevWanted( MatchType mat ) {
- return prev->lastWanted( mat );
+ return (prev) ? prev->lastWanted(mat) : NULL;
}
JoinType join;
int multiple() {
return ( join != SIMPLE );
}
- EntList * next, *prev;
+ EntList * next = NULL, *prev = NULL;
protected:
MatchType viable;
|
