]>
Commit | Line | Data |
---|---|---|
d12a0ed3 TP |
1 | Fix WOKStep_Extract::Execute |
2 | ||
3 | This step did put garbage into generated file, because a pointer was used | |
4 | after it has been freed. | |
5 | Closes: #501352 | |
6 | ||
7 | diff --git a/ros/src/CPPExt/CPPExt.cxx b/ros/src/CPPExt/CPPExt.cxx | |
8 | index 4d96c47..a651607 100644 | |
9 | --- a/ros/src/CPPExt/CPPExt.cxx | |
10 | +++ b/ros/src/CPPExt/CPPExt.cxx | |
11 | @@ -397,7 +397,8 @@ void CPP_BuildMethod(const Handle(MS_MetaSchema)& aMeta, | |
12 | const Handle(TCollection_HAsciiString)& aTypeName=retType->TypeName(); | |
13 | pTypeName=(char *)aTypeName->ToCString(); | |
14 | // | |
15 | - pTypeRet=(char *)CPP_BuildType(aMeta,aTypeName)->ToCString(); | |
16 | + const Handle(TCollection_HAsciiString)& aTypeRet=CPP_BuildType(aMeta,aTypeName); | |
17 | + pTypeRet=(char *)aTypeRet->ToCString(); | |
18 | // | |
19 | //modified by NIZNHY-PKV Mon May 5 15:10:12 2008f | |
20 | if (m->IsPtrReturn()) { | |
21 | diff --git a/ros/src/WOKUnix/WOKUnix_Process.cxx b/ros/src/WOKUnix/WOKUnix_Process.cxx | |
22 | index dd6caf6..fa649c7 100644 | |
23 | --- a/ros/src/WOKUnix/WOKUnix_Process.cxx | |
24 | +++ b/ros/src/WOKUnix/WOKUnix_Process.cxx | |
25 | @@ -373,6 +373,6 @@ void WOKUnix_Process::Kill() | |
26 | void WOKUnix_Process::Destroy() | |
27 | { | |
28 | Kill(); | |
29 | - delete myargv; | |
30 | + delete [] myargv; | |
31 | } | |
32 | #endif |