X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrackoffsetiter.cpp;h=8f21e950a5e3de4dfa3cfa5b1462b455cf90c9bb;hb=d6213fa0f35a06182a7d3e88959c67ff019713b6;hp=f8e8a2d2a4c54a5270c85a41fd5955011c2f9641;hpb=af50f0bdecaf4d08cf13227d092a788c65220845;p=r2c2.git

diff --git a/source/libr2c2/trackoffsetiter.cpp b/source/libr2c2/trackoffsetiter.cpp
index f8e8a2d..8f21e95 100644
--- a/source/libr2c2/trackoffsetiter.cpp
+++ b/source/libr2c2/trackoffsetiter.cpp
@@ -24,25 +24,50 @@ TrackOffsetIter::TrackOffsetIter(Track *t, unsigned e, float o):
 	_track(t, e),
 	_offset(_track ? o : 0),
 	_path((_track && _offset) ? _track->get_active_path() : -1)
-{ }
+{
+	validate();
+}
 
 TrackOffsetIter::TrackOffsetIter(Track *t, unsigned e, unsigned p, float o):
 	_track(t, e),
 	_offset(o),
 	_path(p)
-{ }
+{
+	validate();
+}
 
 TrackOffsetIter::TrackOffsetIter(const TrackIter &t, float o):
 	_track(t),
 	_offset(_track ? o : 0),
 	_path((_track && _offset) ? _track->get_active_path() : -1)
-{ }
+{
+	validate();
+}
 
 TrackOffsetIter::TrackOffsetIter(const TrackIter &t, unsigned p, float o):
 	_track(t),
 	_offset(o),
 	_path(p)
-{ }
+{
+	validate();
+}
+
+void TrackOffsetIter::validate()
+{
+	if(!_track)
+		return;
+
+	if(_offset<0)
+		throw invalid_argument("TrackOffsetIter::TrackOffsetIter");
+
+	if(_path>=0)
+	{
+		if(!_track.endpoint().has_path(_path))
+			throw invalid_argument("TrackOffsetIter::TrackOffsetIter");
+		if(_offset>_track->get_type().get_path_length(_path))
+			throw invalid_argument("TrackOffsetIter::TrackOffsetIter");
+	}
+}
 
 BlockIter TrackOffsetIter::block_iter() const
 {
@@ -92,6 +117,7 @@ TrackOffsetIter TrackOffsetIter::advance(float d, const Route *r) const
 	{
 		if(p<0)
 			p = (r ? r->get_path(*t) : t->get_active_path());
+		p = t->get_type().coerce_path(t.entry(), p);
 
 		float length = t->get_type().get_path_length(p);
 		if(o<length)