Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
b6cd63a4
Commit
b6cd63a4
authored
Aug 23, 2004
by
claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid crash for corrupt window with missing source or dest node for con
parent
a091a695
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
15 deletions
+40
-15
wb/lib/wb/src/wb_foe_methods.c
wb/lib/wb/src/wb_foe_methods.c
+4
-2
wb/lib/wb/src/wb_vldh.c
wb/lib/wb/src/wb_vldh.c
+36
-13
No files found.
wb/lib/wb/src/wb_foe_methods.c
View file @
b6cd63a4
...
...
@@ -1582,7 +1582,8 @@ int foe_new_local(
if
(
EVEN
(
sts
))
return
sts
;
sts
=
vldh_wind_load_all
(
windowobject
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
sts
==
VLDH__WINDCORRUPT
)
{}
else
if
(
EVEN
(
sts
))
return
sts
;
}
/* Create the foe context */
/* SG 02.05.91 by default give the view function */
...
...
@@ -1740,7 +1741,8 @@ int foe_new_local(
if
(
EVEN
(
sts
))
return
sts
;
sts
=
vldh_wind_load_all
(
windowobject
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
sts
==
VLDH__WINDCORRUPT
)
{}
else
if
(
EVEN
(
sts
))
return
sts
;
}
function
=
old_foectx
->
function
;
...
...
wb/lib/wb/src/wb_vldh.c
View file @
b6cd63a4
...
...
@@ -1245,9 +1245,15 @@ int vldh_wind_quit_all (
)
{
int
sts
;
ldh_sSessInfo
info
;
sts
=
ldh_GetSessionInfo
(
wind
->
hw
.
ldhsession
,
&
info
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
!
info
.
Empty
)
{
sts
=
ldh_RevertSession
(
wind
->
hw
.
ldhsession
);
if
(
EVEN
(
sts
))
return
sts
;
}
vldh_wind_quit
(
wind
);
...
...
@@ -1627,6 +1633,9 @@ int vldh_wind_load_all (
char
*
nodebuffer
;
unsigned
char
source_found
;
unsigned
char
dest_found
;
int
rsts
;
rsts
=
VLDH__SUCCESS
;
/* Get the first child to the window */
sts
=
ldh_GetChild
(
wind
->
hw
.
ldhsession
,
wind
->
lw
.
objdid
,
&
next_objdid
);
...
...
@@ -1691,10 +1700,13 @@ int vldh_wind_load_all (
}
node
++
;
}
#if 0
/* LOOK FOR A BUGG!!! */
if ( !(source_found && dest_found ))
{
if
(
!
(
source_found
&&
dest_found
))
{
char
name
[
80
];
rsts
=
VLDH__WINDCORRUPT
;
/* Source or destination is missing, delete the connection */
(
*
con_ptr
)
->
hc
.
status
|=
VLDH_DELETE
;
if
(
source_found
)
...
...
@@ -1703,20 +1715,31 @@ int vldh_wind_load_all (
if
(
dest_found
)
vldh_node_con_delete
(
(
*
con_ptr
)
->
hc
.
dest_node_pointer
,
(
*
con_ptr
)
->
lc
.
dest_point
,
*
con_ptr
);
printf("LOAD ERROR CON con: %d source: %d pnt: %d dest: %d pnt: %d \n",
(*con_ptr)->lc.objdid,
(*con_ptr)->lc.source_node_did,
(*con_ptr)->hc.source_node_pointer,
(*con_ptr)->lc.dest_node_did,
(*con_ptr)->hc.dest_node_pointer);
sts
=
ldh_ObjidToName
(
wind
->
hw
.
ldhsession
,
(
*
con_ptr
)
->
lc
.
objdid
,
ldh_eName_Object
,
name
,
sizeof
(
name
),
&
size
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
!
source_found
)
printf
(
"** Error connection source node is missing: %s soix: %d doix: %d
\n
"
,
name
,
(
*
con_ptr
)
->
lc
.
source_node_did
.
oix
,
(
*
con_ptr
)
->
lc
.
dest_node_did
.
oix
);
if
(
!
dest_found
)
printf
(
"** Error connection destination node is missing: %s soix: %d doix: %d
\n
"
,
name
,
(
*
con_ptr
)
->
lc
.
source_node_did
.
oix
,
(
*
con_ptr
)
->
lc
.
dest_node_did
.
oix
);
}
/* END LOOK FOR A BUGG!!! */
#endif
con_ptr
++
;
}
if
(
con_count
>
0
)
XtFree
((
char
*
)
conlist
);
if
(
node_count
>
0
)
XtFree
((
char
*
)
nodelist
);
return
VLDH__SUCCESS
;
return
rsts
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment