From a99792b9bdc57d671a3006bed27d6cdf8b1fa3cb Mon Sep 17 00:00:00 2001 From: dmv Date: Wed, 22 Jul 2009 11:21:19 +0000 Subject: [PATCH] IPAL21263 addToStudy with doRestoreSubShapes=True leads to crash --- src/GEOM_I/GEOM_Gen_i.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 512855280..eb3a8c585 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -802,18 +802,18 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesSO (SALOMEDS::Study_ptr theStudy return aParts._retn(); aParts = RestoreSubShapes(theStudy, anO, theSObject, theArgs, theFindMethod, theInheritFirstArg); - aParts._retn(); + return aParts._retn(); } //============================================================================ // function : addToListOfGO // purpose : static local function //============================================================================ -static void addToListOfGO( const GEOM::GEOM_Object_var& theObject, - GEOM::ListOfGO_var& theList ) +static void addToListOfGO( const GEOM::GEOM_Object_ptr& theObject, + GEOM::ListOfGO& theList ) { - const int oldLen = theList->length(); - theList->length(oldLen + 1); + const int oldLen = theList.length(); + theList.length(oldLen + 1); theList[ oldLen ] = theObject; } @@ -821,12 +821,12 @@ static void addToListOfGO( const GEOM::GEOM_Object_var& theObject, // function : addToListOfGO // purpose : static local function //============================================================================ -static void addToListOfGO( GEOM::ListOfGO_var& theSrcList, - GEOM::ListOfGO_var& theTrgList ) +static void addToListOfGO( const GEOM::ListOfGO& theSrcList, + GEOM::ListOfGO& theTrgList ) { - const int oldLen = theTrgList->length(); - const int srcLen = theSrcList->length(); - theTrgList->length(oldLen + srcLen); + const int oldLen = theTrgList.length(); + const int srcLen = theSrcList.length(); + theTrgList.length(oldLen + srcLen); for( int i = 0; i < srcLen; i++ ) theTrgList[ oldLen + i ] = theSrcList[ i ]; }