914 Why is the code InChI=123 valid

api/c/tests/unit/tests/inchi.cpp

@@ -63,7 +63,7 @@ TEST_F(IndigoApiInchiTest, basic)
     }
     catch (const std::exception& e)
     {
-        ASSERT_STREQ("inchi-wrapper: Indigo-InChI: no structural data has been provided: . Code: -1.", e.what());
+        ASSERT_STREQ("inchi-wrapper: Wrong InChI format", e.what());
     }
 }
 
@@ -77,6 +77,20 @@ TEST_F(IndigoApiInchiTest, incorrect_symbols)
     }
     catch (const std::exception& e)
     {
-        ASSERT_STREQ("inchi-wrapper: Indigo-InChI: no structural data has been provided: (null). Code: -1.", e.what());
+        ASSERT_STREQ("inchi-wrapper: Wrong InChI format", e.what());
     }
-}
+}
+
+TEST_F(IndigoApiInchiTest, incorrect_symbols_123)
+{
+    try
+    {
+        const char* inchi = "InChI=123";
+        const auto m = indigoInchiLoadMolecule(inchi);
+        EXPECT_ANY_THROW(indigoInchiGetInchi(m));
+    }
+    catch (const std::exception& e)
+    {
+        ASSERT_STREQ("inchi-wrapper: Wrong InChI format", e.what());
+    }
+}

core/indigo-core/molecule/src/inchi_wrapper.cpp

@@ -173,13 +173,13 @@ void InchiWrapper::loadMoleculeFromInchi(const char* inchi_string, Molecule& mol
         log.readString(inchi_output.szLog, true);
 
     if (retcode == inchi_Ret_EOF) /* no structural data has been provided */
-        throw Error("Indigo-InChI: no structural data has been provided: %s. Code: %d.", inchi_output.szMessage, retcode);
+        throw Error("Wrong InChI format");
 
     if (retcode == inchi_Ret_BUSY) /* Previuos call to InChI has not returned yet */
-        throw Error("Indigo-InChI: Previuos call to InChI has not returned yet: %s. Code: %d.", inchi_output.szMessage, retcode);
+        throw Error("Internal error parsing InChI string");
 
     if (retcode != inchi_Ret_OKAY && retcode != inchi_Ret_WARNING)
-        throw Error("Indigo-InChI: InChI loading failed: %s. Code: %d.", inchi_output.szMessage, retcode);
+        throw Error("Internal error parsing InChI string");
 
     // Check stereo options
     _stereo_opt = _STEREO_ABS;