Fix a segfault when searching for an atom that doesn't exist, from a …

…molecule editor (or anything that isn't re-wrapped)
OpenBioSim · Feb 8, 2023 · 7483121 · 7483121
1 parent 46f9779
commit 7483121
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/corelib/src/libs/SireMol/moleculeview.cpp b/corelib/src/libs/SireMol/moleculeview.cpp
@@ -501,7 +501,17 @@ Atom MoleculeView::atom(const QString &name, const PropertyMap &map) const
     {
         try
         {
-            auto a = this->search(name).views().at(0).atom();
+            auto matches = this->search(name).views();
+
+            if (matches.isEmpty())
+            {
+                throw SireMol::missing_atom(QObject::tr(
+                                                "No atom matches '%1'")
+                                                .arg(name),
+                                            CODELOC);
+            }
+
+            auto a = matches.at(0).atom();
             return this->atom(a.index(), map);
         }
         catch (...)