Menu
▾
▴
Re: [Flightgear-devel] [Flightgear-commitlogs] [FlightGear] branch next updated: Correct whitespace in NasalPositioned.cxx; fix segfault in NasalPositioned by adding null check in the legGhostGetMember method; add test case for segfault
This is bad and means the fix didn't work. The fix was supposed to catch the segfault, and certainly worked on my side - I tested it several times both in test suite and nasal console. Is this platform-specific maybe? Any details on the segfault? Jonathan On Sat, Feb 1, 2020 at 2:00 PM Lars Toenning <de...@lt...> wrote: > After this commit the test_suite is crashing in my local build: > > [Unit Tests] > > . 0.646 ms for AutosaveMigrationTests::testMigration > . 2.184 s for RouteManagerTests::testBasic > . 59.750 ms for RouteManagerTests::testDefaultSID > . 57.626 ms for RouteManagerTests::testDefaultApproach > . 176.429 ms for RouteManagerTests::testDirectToLegOnFlightplanAndResume > . 809.070 ms for RouteManagerTests::testHoldFromNasal > . 1.358 ms for AircraftPerformanceTests::testBasic > . 0.745 ms for AircraftPerformanceTests::testAltitudeGradient > . 0.934 ms for NavaidsTests::testBasic > F 59.461 ms for FlightplanTests::testBasic > F 60.432 ms for FlightplanTests::testRoutePathBasic > F 59.007 ms for FlightplanTests::testRoutePathSkipped > F 57.338 ms for FlightplanTests::testRoutePathTrivialFlightPlan > . 71.249 ms for FlightplanTests::testBasicAirways > . 65.812 ms for FlightplanTests::testAirwayNetworkRoute > . 63.812 ms for FlightplanTests::testBug1814 > zsh: bus error (core dumped) ./fgfs_test_suite -t > > On 1/30/20 11:42 AM, flightgear-commitlogs--- via Flightgear-commitlogs > wrote: > > allura pushed a commit to branch next > > in repository flightgear. > > > > The following commit(s) were added to refs/heads/next by this push: > > new b920a09fc Correct whitespace in NasalPositioned.cxx; fix > segfault in NasalPositioned by adding null check in the legGhostGetMember > method; add test case for segfault > > new 12cd2d8e9 Merge /u/legoboyvdlp/flightgear-src/ branch > fix-segfault into next > > b920a09fc is described below > > > > SF URL: > http://sourceforge.net/p/flightgear/flightgear/ci/b920a09fcf789d665d64da9a8f5346e7735c1afb/ > > > > Commit: b920a09fcf789d665d64da9a8f5346e7735c1afb > > Author: legoboyvdlp R > > Committer: legoboyvdlp R > > AuthorDate: Mon Jan 27 16:27:46 2020 +0000 > > > > Correct whitespace in NasalPositioned.cxx; fix segfault in > NasalPositioned by adding null check in the legGhostGetMember method; add > test case for segfault > > > > > > > > > > --- > > src/Scripting/NasalPositioned.cxx | 104 > ++++++++++++---------- > > test_suite/unit_tests/Navaids/test_flightplan.cxx | 78 > ++++++++++------ > > test_suite/unit_tests/Navaids/test_flightplan.hxx | 4 +- > > 3 files changed, 109 insertions(+), 77 deletions(-) > > > > diff --git a/src/Scripting/NasalPositioned.cxx > b/src/Scripting/NasalPositioned.cxx > > index e4b788df0..1760e7b52 100644 > > --- a/src/Scripting/NasalPositioned.cxx > > +++ b/src/Scripting/NasalPositioned.cxx > > @@ -346,7 +346,7 @@ naRef ghostForPositioned(naContext c, > FGPositionedRef pos) > > if (!pos) { > > return naNil(); > > } > > - > > + > > switch (pos->type()) { > > case FGPositioned::VOR: > > case FGPositioned::NDB: > > @@ -478,7 +478,7 @@ static naRef waypointNavaid(naContext c, Waypt* wpt) > > if (!pos || (!FGNavRecord::isNavaidType(pos) && > !fgpositioned_cast<FGFix>(pos))) { > > return naNil(); > > } > > - > > + > > return ghostForPositioned(c, wpt->source()); > > } > > > > @@ -616,7 +616,7 @@ static bool waypointCommonSetMember(naContext c, > Waypt* wpt, const char* fieldNa > > // nothing changed > > return false; > > } > > - > > + > > return true; > > } > > > > @@ -701,6 +701,12 @@ static const char* legGhostGetMember(naContext c, > void* g, naRef field, naRef* o > > { > > const char* fieldName = naStr_data(field); > > FlightPlan::Leg* leg = (FlightPlan::Leg*) g; > > + if (!leg) { > > + *out = naNil(); > > + naRuntimeError(c, "leg ghost member fetched, but no associated > leg object found"); > > + return ""; > > + } > > + > > Waypt* wpt = leg->waypoint(); > > > > if (!strcmp(fieldName, "parents")) { > > @@ -732,7 +738,11 @@ static const char* legGhostGetMember(naContext c, > void* g, naRef field, naRef* o > > } else if (!strcmp(fieldName, "hold_count")) { > > *out = naNum(leg->holdCount()); > > } else { // check for fields defined on the underlying waypoint > > - return waypointCommonGetMember(c, wpt, fieldName, out); > > + if (wpt) { // FIXME null check shouldn't be required, check refcount > > + return waypointCommonGetMember(c, wpt, fieldName, out); > > + } else { > > + naRuntimeError(c, "leg ghost member fetched, but no underlying > waypoint object found"); > > + } > > } > > > > return ""; // success > > @@ -749,7 +759,7 @@ static void legGhostSetMember(naContext c, void* g, > naRef field, naRef value) > > { > > const char* fieldName = naStr_data(field); > > FlightPlan::Leg* leg = (FlightPlan::Leg*) g; > > - > > + > > bool didChange = false; > > if (!strcmp(fieldName, "hold_count")) { > > const int count = static_cast<int>(value.num); > > @@ -759,13 +769,13 @@ static void legGhostSetMember(naContext c, void* > g, naRef field, naRef value) > > } else if (!strcmp(fieldName, "hold_heading_radial_deg")) { > > if (!leg->convertWaypointToHold()) > > naRuntimeError(c, "couldn't convert leg waypoint into a hold"); > > - > > + > > // now we can call the base method > > didChange = waypointCommonSetMember(c, leg->waypoint(), fieldName, > value); > > } else { > > didChange = waypointCommonSetMember(c, leg->waypoint(), fieldName, > value); > > } > > - > > + > > if (didChange) { > > leg->markWaypointDirty(); > > } > > @@ -874,7 +884,7 @@ static void flightplanGhostSetMember(naContext c, > void* g, naRef field, naRef va > > fp->setDestination(static_cast<FGRunway*>(nullptr)); > > return; > > } > > - > > + > > FGRunway* rwy = runwayGhost(value); > > if (rwy){ > > fp->setDestination(rwy); > > @@ -1256,7 +1266,7 @@ static int geodFromArgs(naRef* args, int offset, > int argc, SGGeod& result) > > result = wayptGhost(args[offset])->position(); > > return 1; > > } > > - > > + > > if (gt == &FPLegGhostType) { > > result = fpLegGhost(args[offset])->waypoint()->position(); > > return 1; > > @@ -1366,30 +1376,30 @@ static naRef f_geodtocart(naContext c, naRef me, > int argc, naRef* args) > > */ > > static naRef f_get_cart_ground_intersection(naContext c, naRef me, int > argc, naRef* args) > > { > > - SGVec3d dir; > > - SGVec3d pos; > > + SGVec3d dir; > > + SGVec3d pos; > > > > - if (argc != 2) > > - naRuntimeError(c, "geod_hash > get_cart_ground_intersection(position: hash{x,y,z}, direction:hash{x,y,z}) > expects 2 arguments"); > > + if (argc != 2) > > + naRuntimeError(c, "geod_hash > get_cart_ground_intersection(position: hash{x,y,z}, direction:hash{x,y,z}) > expects 2 arguments"); > > > > - if (!vec3dFromHash(args[0], pos)) > > - naRuntimeError(c, "geod_hash > get_cart_ground_intersection(position:hash{x,y,z}, direction:hash{x,y,z}) > expects argument(0) to be hash of position containing x,y,z"); > > + if (!vec3dFromHash(args[0], pos)) > > + naRuntimeError(c, "geod_hash > get_cart_ground_intersection(position:hash{x,y,z}, direction:hash{x,y,z}) > expects argument(0) to be hash of position containing x,y,z"); > > > > - if (!vec3dFromHash(args[1], dir)) > > - naRuntimeError(c, "geod_hash > get_cart_ground_intersection(position: hash{x,y,z}, direction:hash{x,y,z}) > expects argument(1) to be hash of direction containing x,y,z"); > > + if (!vec3dFromHash(args[1], dir)) > > + naRuntimeError(c, "geod_hash > get_cart_ground_intersection(position: hash{x,y,z}, direction:hash{x,y,z}) > expects argument(1) to be hash of direction containing x,y,z"); > > > > - SGVec3d nearestHit; > > - if (!globals->get_scenery()->get_cart_ground_intersection(pos, > dir, nearestHit)) > > - return naNil(); > > + SGVec3d nearestHit; > > + if (!globals->get_scenery()->get_cart_ground_intersection(pos, dir, > nearestHit)) > > + return naNil(); > > > > - const SGGeod geodHit = SGGeod::fromCart(nearestHit); > > + const SGGeod geodHit = SGGeod::fromCart(nearestHit); > > > > - // build a hash for returned intersection > > - naRef intersection_h = naNewHash(c); > > - hashset(c, intersection_h, "lat", naNum(geodHit.getLatitudeDeg())); > > - hashset(c, intersection_h, "lon", > naNum(geodHit.getLongitudeDeg())); > > - hashset(c, intersection_h, "elevation", > naNum(geodHit.getElevationM())); > > - return intersection_h; > > + // build a hash for returned intersection > > + naRef intersection_h = naNewHash(c); > > + hashset(c, intersection_h, "lat", naNum(geodHit.getLatitudeDeg())); > > + hashset(c, intersection_h, "lon", naNum(geodHit.getLongitudeDeg())); > > + hashset(c, intersection_h, "elevation", > naNum(geodHit.getElevationM())); > > + return intersection_h; > > } > > > > // convert from aircraft reference frame to global (ECEF) cartesian > > @@ -1439,11 +1449,11 @@ static naRef f_geodinfo(naContext c, naRef me, > int argc, naRef* args) > > double elev = argc == 3 ? naNumValue(args[2]).num : 10000; > > const simgear::BVHMaterial *material; > > SGGeod geod = SGGeod::fromDegM(lon, lat, elev); > > - > > + > > const auto scenery = globals->get_scenery(); > > if (scenery == nullptr) > > return naNil(); > > - > > + > > if(!scenery->get_elevation_m(geod, elev, &material)) > > return naNil(); > > > > @@ -1783,7 +1793,7 @@ static naRef f_airport_approaches(naContext c, > naRef me, int argc, naRef* args) > > appIds.insert(app->ident()); > > } > > } > > - > > + > > for (auto s : appIds) { > > naVec_append(approaches, stringToNasal(c, s)); > > } > > @@ -1792,13 +1802,13 @@ static naRef f_airport_approaches(naContext c, > naRef me, int argc, naRef* args) > > RunwayVec runways; > > if (star) > > runways = star->runways(); > > - > > + > > for (unsigned int s=0; s<apt->numApproaches(); ++s) { > > Approach* app = apt->getApproachByIndex(s); > > if ((ty != PROCEDURE_INVALID) && (app->type() != ty)) { > > continue; > > } > > - > > + > > naRef procId = stringToNasal(c, app->ident()); > > naVec_append(approaches, procId); > > } > > @@ -2166,24 +2176,24 @@ static naRef f_findByIdent(naContext c, naRef > me, int argc, naRef* args) > > if ((argc < 2) || !naIsString(args[0]) || !naIsString(args[1]) ) { > > naRuntimeError(c, "finxByIdent: expects ident and type as > first two args"); > > } > > - > > + > > std::string ident(naStr_data(args[0])); > > std::string typeSpec(naStr_data(args[1])); > > - > > + > > // optional specify search pos as final argument > > SGGeod pos = globals->get_aircraft_position(); > > geodFromArgs(args, 2, argc, pos); > > FGPositioned::TypeFilter > filter(FGPositioned::TypeFilter::fromString(typeSpec)); > > - > > + > > naRef r = naNewVector(c); > > > > FGPositionedList matches = FGPositioned::findAllWithIdent(ident, > &filter); > > FGPositioned::sortByRange(matches, pos); > > - > > + > > for (auto f : matches) { > > naVec_append(r, ghostForPositioned(c, f)); > > } > > - > > + > > return r; > > } > > > > @@ -2235,7 +2245,7 @@ static naRef f_formatLatLon(naContext c, naRef me, > int argc, naRef* args) > > if (argOffset == 0) { > > naRuntimeError(c, "invalid arguments to formatLatLon, expect a > geod or lat,lon"); > > } > > - > > + > > simgear::strutils::LatLonFormat format = > > > static_cast<simgear::strutils::LatLonFormat>(fgGetInt("/sim/lon-lat-format")); > > if (argOffset < argc && naIsNum(args[argOffset])) { > > @@ -2244,7 +2254,7 @@ static naRef f_formatLatLon(naContext c, naRef me, > int argc, naRef* args) > > naRuntimeError(c, "invalid lat-lon format requested"); > > } > > } > > - > > + > > const auto s = simgear::strutils::formatGeodAsString(p, format); > > return stringToNasal(c, s); > > } > > @@ -2254,13 +2264,13 @@ static naRef > f_parseStringAsLatLonValue(naContext c, naRef me, int argc, naRef* > > if ((argc < 1) || !naIsString(args[0])) { > > naRuntimeError(c, "Missing / bad argument to > parseStringAsLatLonValue"); > > } > > - > > + > > double value; > > bool ok = > simgear::strutils::parseStringAsLatLonValue(naStr_data(args[0]), value); > > if (!ok) { > > return naNil(); > > } > > - > > + > > return naNum(value); > > } > > > > @@ -2400,7 +2410,7 @@ public: > > { > > callDelegateMethod("activated"); > > } > > - > > + > > void sequence() override > > { > > callDelegateMethod("sequence"); > > @@ -2555,7 +2565,7 @@ static naRef f_airwaySearch(naContext c, naRef me, > int argc, naRef* args) > > > > static FGPositionedRef positionedFromArg(naRef ref) > > { > > - if (!naIsGhost(ref)) > > + if (!naIsGhost(ref)) > > return {}; > > > > naGhostType* gt = naGhost_type(ref); > > @@ -2592,7 +2602,7 @@ static naRef f_findAirway(naContext c, naRef me, > int argc, naRef* args) > > if (argc >= 2) { > > pos = positionedFromArg(args[1]); > > if (naIsString(args[1])) { > > - // level spec, > > + // level spec, > > } > > } > > > > @@ -2675,7 +2685,7 @@ static naRef f_createViaTo(naContext c, naRef me, > int argc, naRef* args) > > std::string airwayName = naStr_data(args[0]); > > AirwayRef airway = Airway::findByIdent(airwayName, Airway::Both); > > if (!airway) { > > - naRuntimeError(c, "createViaTo: couldn't find airway with > provided name: %s", > > + naRuntimeError(c, "createViaTo: couldn't find airway with > provided name: %s", > > naStr_data(args[0])); > > } > > > > @@ -2717,8 +2727,8 @@ static naRef f_createViaFromTo(naContext c, naRef > me, int argc, naRef* args) > > std::string airwayName = naStr_data(args[1]); > > AirwayRef airway = Airway::findByIdentAndNavaid(airwayName, from); > > if (!airway) { > > - naRuntimeError(c, "createViaFromTo: couldn't find airway with > provided name: %s from wp %s", > > - naStr_data(args[0]), > > + naRuntimeError(c, "createViaFromTo: couldn't find airway with > provided name: %s from wp %s", > > + naStr_data(args[0]), > > from->ident().c_str()); > > } > > > > diff --git a/test_suite/unit_tests/Navaids/test_flightplan.cxx > b/test_suite/unit_tests/Navaids/test_flightplan.cxx > > index 3a0f194e9..fa41e6a0e 100644 > > --- a/test_suite/unit_tests/Navaids/test_flightplan.cxx > > +++ b/test_suite/unit_tests/Navaids/test_flightplan.cxx > > @@ -24,6 +24,13 @@ void FlightplanTests::setUp() > > { > > FGTestApi::setUp::initTestGlobals("flightplan"); > > FGTestApi::setUp::initNavDataCache(); > > + > > + globals->get_subsystem_mgr()->init(); > > + > > + FGTestApi::setUp::initStandardNasal(); > > + > > + globals->get_subsystem_mgr()->postinit(); > > + globals->get_subsystem_mgr()->bind(); > > } > > > > > > @@ -57,13 +64,13 @@ void FlightplanTests::testBasic() > > CPPUNIT_ASSERT_EQUAL(fp1->numLegs(), 5); > > > > CPPUNIT_ASSERT(fp1->legAtIndex(0)->waypoint()->source()->ident() > == "23L"); > > - > > + > > CPPUNIT_ASSERT(fp1->legAtIndex(1)->waypoint()->source()->ident() > == "TNT"); > > CPPUNIT_ASSERT(fp1->legAtIndex(1)->waypoint()->source()->name() == > "TRENT VOR-DME"); > > > > CPPUNIT_ASSERT(fp1->legAtIndex(2)->waypoint()->source()->ident() > == "CLN"); > > CPPUNIT_ASSERT(fp1->legAtIndex(2)->waypoint()->source()->name() == > "CLACTON VOR-DME"); > > - > > + > > CPPUNIT_ASSERT(fp1->legAtIndex(4)->waypoint()->source()->ident() > == "24"); > > > > } > > @@ -147,24 +154,24 @@ void FlightplanTests::testRoutePathVec() > > FlightPlanRef fp1 = makeTestFP("KNUQ", "14L", "PHNL", "22R", > > "ROKME WOVAB"); > > RoutePath rtepath(fp1); > > - > > + > > SGGeodVec vec = rtepath.pathForIndex(0); > > - > > + > > FGAirportRef ksfo = FGAirport::findByIdent("KSFO"); > > FGFixRef rokme = > fgpositioned_cast<FGFix>(FGPositioned::findClosestWithIdent("ROKME", > ksfo->geod())); > > auto depRwy = fp1->departureRunway(); > > - > > + > > CPPUNIT_ASSERT_DOUBLES_EQUAL(depRwy->geod().getLongitudeDeg(), > vec.front().getLongitudeDeg(), 0.01); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(depRwy->geod().getLatitudeDeg(), > vec.front().getLatitudeDeg(), 0.01); > > - > > + > > SGGeodVec vec1 = rtepath.pathForIndex(1); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLongitudeDeg(), > vec1.back().getLongitudeDeg(), 0.01); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLatitudeDeg(), > vec1.back().getLatitudeDeg(), 0.01); > > - > > + > > SGGeodVec vec2 = rtepath.pathForIndex(2); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLongitudeDeg(), > vec2.front().getLongitudeDeg(), 0.01); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLatitudeDeg(), > vec2.front().getLatitudeDeg(), 0.01); > > - > > + > > //CPPUNIT_ASSERT(vec.front() > > } > > > > @@ -172,22 +179,22 @@ void FlightplanTests::testRoutPathWpt0Midflight() > > { > > // test behaviour of RoutePath when WP0 is not a runway > > // happens for the Airbus ND which removes past wpts when > sequencing > > - > > + > > FlightPlanRef fp1 = makeTestFP("KNUQ", "14L", "PHNL", "22R", > > "ROKME WOVAB"); > > // actually delete leg 0 so we start at ROKME > > fp1->deleteIndex(0); > > - > > + > > RoutePath rtepath(fp1); > > - > > + > > SGGeodVec vec = rtepath.pathForIndex(0); > > - > > + > > FGAirportRef ksfo = FGAirport::findByIdent("KSFO"); > > FGFixRef rokme = > fgpositioned_cast<FGFix>(FGPositioned::findClosestWithIdent("ROKME", > ksfo->geod())); > > - > > + > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLongitudeDeg(), > vec.front().getLongitudeDeg(), 0.01); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLatitudeDeg(), > vec.front().getLatitudeDeg(), 0.01); > > - > > + > > SGGeodVec vec2 = rtepath.pathForIndex(1); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLongitudeDeg(), > vec2.front().getLongitudeDeg(), 0.01); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(rokme->geod().getLatitudeDeg(), > vec2.front().getLatitudeDeg(), 0.01); > > @@ -199,11 +206,11 @@ void FlightplanTests::testBasicAirways() > > { > > Airway* awy = Airway::findByIdent("J547", Airway::HighLevel); > > CPPUNIT_ASSERT_EQUAL(awy->ident(), std::string("J547")); > > - > > + > > FGAirportRef kord = FGAirport::findByIdent("KORD"); > > FlightPlanRef f = new FlightPlan; > > f->setDeparture(kord); > > - > > + > > CPPUNIT_ASSERT(awy->findEnroute("KITOK")); > > CPPUNIT_ASSERT(awy->findEnroute("LESUB")); > > > > @@ -214,12 +221,12 @@ void FlightplanTests::testBasicAirways() > > > > auto wptKUBBS = f->waypointFromString("KUBBS"); > > auto wptFNT = f->waypointFromString("FNT"); > > - > > + > > CPPUNIT_ASSERT(awy->canVia(wptKUBBS, wptFNT)); > > - > > + > > WayptVec path = awy->via(wptKUBBS, wptFNT); > > CPPUNIT_ASSERT_EQUAL(4, static_cast<int>(path.size())); > > - > > + > > CPPUNIT_ASSERT_EQUAL(std::string("PMM"), path.at(0)->ident()); > > CPPUNIT_ASSERT_EQUAL(std::string("HASTE"), path.at(1)->ident()); > > CPPUNIT_ASSERT_EQUAL(std::string("DEWIT"), path.at(2)->ident()); > > @@ -231,16 +238,16 @@ void FlightplanTests::testAirwayNetworkRoute() > > FGAirportRef egph = FGAirport::findByIdent("EGPH"); > > FlightPlanRef f = new FlightPlan; > > f->setDeparture(egph); > > - > > + > > auto highLevelNet = Airway::highLevel(); > > - > > + > > auto wptTLA = f->waypointFromString("TLA"); > > auto wptCNA = f->waypointFromString("CNA"); > > - > > + > > WayptVec route; > > bool ok = highLevelNet->route(wptTLA, wptCNA, route); > > CPPUNIT_ASSERT(ok); > > - > > + > > CPPUNIT_ASSERT_EQUAL(static_cast<int>(route.size()), 18); > > } > > > > @@ -250,25 +257,25 @@ void FlightplanTests::testParseICAORoute() > > FlightPlanRef f = new FlightPlan; > > f->setDeparture(kord); > > f->setDestination(FGAirport::findByIdent("KSAN")); > > - > > + > > const char* route = "DCT JOT J26 IRK J96 SLN J18 GCK J96 CIM J134 > GUP J96 KEYKE J134 DRK J78 LANCY J96 PKE"; > > // const char* route = "DCT KUBBS J547 FNT Q824 HOCKE Q905 SIKBO > Q907 MIILS N400A TUDEP NATW GISTI DCT SLANY UL9 DIKAS UL18 GAVGO UL9 KONAN > UL607 UBIDU Y863 RUDUS T109 HAREM T104 ANORA STAR"; > > bool ok = f->parseICAORouteString(route); > > CPPUNIT_ASSERT(ok); > > - > > - > > - > > + > > + > > + > > } > > > > void FlightplanTests::testParseICANLowLevelRoute() > > { > > const char* route = "DCT DPA V6 IOW V216 LAA V210 GOSIP V83 ACHES > V210 BLOKE V83 ALS V210 RSK V95 INW V12 HOXOL V264 OATES V12 JUWSO V264 > PKE"; > > - > > + > > FGAirportRef kord = FGAirport::findByIdent("KORD"); > > FlightPlanRef f = new FlightPlan; > > f->setDeparture(kord); > > f->setDestination(FGAirport::findByIdent("KSAN")); > > - > > + > > bool ok = f->parseICAORouteString(route); > > CPPUNIT_ASSERT(ok); > > } > > @@ -320,3 +327,16 @@ void FlightplanTests::testBug1814() > > CPPUNIT_ASSERT_DOUBLES_EQUAL(137, leg->distanceNm(), 0.5); > > CPPUNIT_ASSERT_DOUBLES_EQUAL(101, f->legAtIndex(2)->distanceNm(), > 0.5); > > } > > + > > +void FlightplanTests::testSegfaultWaypointGhost() { > > + // checking for a segfault here, no segfault indicates success. A > runtime error in the log is acceptable here. > > + bool ok = FGTestApi::executeNasal(R"( > > + var fp = createFlightplan(); > > + fp.departure = airportinfo("BIKF"); > > + fp.destination = airportinfo("EGLL"); > > + var wp = fp.getWP(1); > > + fp.deleteWP(1); > > + print(wp.wp_name); > > + )"); > > + CPPUNIT_ASSERT(ok); > > +} > > diff --git a/test_suite/unit_tests/Navaids/test_flightplan.hxx > b/test_suite/unit_tests/Navaids/test_flightplan.hxx > > index a52df3fb8..d73bd955e 100644 > > --- a/test_suite/unit_tests/Navaids/test_flightplan.hxx > > +++ b/test_suite/unit_tests/Navaids/test_flightplan.hxx > > @@ -38,9 +38,10 @@ class FlightplanTests : public CppUnit::TestFixture > > CPPUNIT_TEST(testBasicAirways); > > CPPUNIT_TEST(testAirwayNetworkRoute); > > CPPUNIT_TEST(testBug1814); > > + CPPUNIT_TEST(testSegfaultWaypointGhost); > > CPPUNIT_TEST(testRoutPathWpt0Midflight); > > CPPUNIT_TEST(testRoutePathVec); > > - > > + > > // CPPUNIT_TEST(testParseICAORoute); > > // CPPUNIT_TEST(testParseICANLowLevelRoute); > > CPPUNIT_TEST_SUITE_END(); > > @@ -62,6 +63,7 @@ public: > > void testParseICAORoute(); > > void testParseICANLowLevelRoute(); > > void testBug1814(); > > + void testSegfaultWaypointGhost(); > > void testRoutPathWpt0Midflight(); > > void testRoutePathVec(); > > }; > > > > > > _______________________________________________ > > Flightgear-commitlogs mailing list > > Fli...@li... > > https://lists.sourceforge.net/lists/listinfo/flightgear-commitlogs > > > > > _______________________________________________ > Flightgear-devel mailing list > Fli...@li... > https://lists.sourceforge.net/lists/listinfo/flightgear-devel > |
