Daniel Lowe notes passing null here through to the JNI-INCHI can cras…

…h the JVM.
cdk · Dec 5, 2021 · 5471fae · 5471fae
1 parent dfbc328
commit 5471fae
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/storage/inchi/src/main/java/org/openscience/cdk/inchi/InChIToStructure.java b/storage/inchi/src/main/java/org/openscience/cdk/inchi/InChIToStructure.java
@@ -112,6 +112,8 @@ public class InChIToStructure {
      * @throws CDKException
      */
     protected InChIToStructure(String inchi, IChemObjectBuilder builder) throws CDKException {
+        if (inchi == null)
+            throw new NullPointerException();
         try {
             input = new JniInchiInputInchi(inchi, "");
         } catch (JniInchiException jie) {
@@ -127,6 +129,8 @@ protected InChIToStructure(String inchi, IChemObjectBuilder builder) throws CDKE
      * @throws CDKException
      */
     protected InChIToStructure(String inchi, IChemObjectBuilder builder, String options) throws CDKException {
+        if (inchi == null)
+            throw new NullPointerException();
         try {
             input = new JniInchiInputInchi(inchi, options);
         } catch (JniInchiException jie) {
@@ -142,6 +146,8 @@ protected InChIToStructure(String inchi, IChemObjectBuilder builder, String opti
      * @throws CDKException
      */
     protected InChIToStructure(String inchi, IChemObjectBuilder builder, List<String> options) throws CDKException {
+        if (inchi == null)
+            throw new NullPointerException();
         try {
             input = new JniInchiInputInchi(inchi, options);
         } catch (JniInchiException jie) {