From d9233caa4265652a5feb0c5237a4b7419847f1d4 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Wed, 29 Jan 2025 00:56:37 +0100
Subject: [PATCH] Fixed issue #1981

---
 src/db/db/dbGenericShapeIterator.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/db/db/dbGenericShapeIterator.h b/src/db/db/dbGenericShapeIterator.h
index 570cb58e1..4e44681b6 100644
--- a/src/db/db/dbGenericShapeIterator.h
+++ b/src/db/db/dbGenericShapeIterator.h
@@ -495,7 +495,11 @@ private:
 
   void set ()
   {
-    m_object = db::object_with_properties<T> (*m_basic, m_basic.prop_id ());
+    if (! at_end ()) {
+      m_object = db::object_with_properties<T> (*m_basic, m_basic.prop_id ());
+    } else {
+      m_object = db::object_with_properties<T> ();
+    }
   }
 };