v.1.07.5-RC4

Author: djb-rwth

INCHI-1-SRC/INCHI_BASE/src/permutation_util.c

@@ -49,13 +49,6 @@
 #include <ctype.h>
 #include <locale.h>
 
-#ifndef COMPILE_ANSI_ONLY
-#include <conio.h>
-#ifndef TARGET_LIB_FOR_WINCHI
-#include <windows.h>
-#endif
-#endif
-
 #include "mode.h"
 
 #if( BUILD_WITH_AMI == 1 && defined( _MSC_VER ) && MSC_AMI == 1 )

INCHI-1-SRC/INCHI_BASE/src/readinch.c

@@ -886,7 +886,6 @@ int InchiToInpAtom( INCHI_IOSTREAM *inp_file,
                     num_atoms = INCHI_INP_ERROR_RET; /* error */
                     *err = INCHI_INP_ERROR_ERR;
                     TREAT_ERR(*err, 0, "Wrong number of atoms");
-                    inchi_free(atom); /* djb-rwth: fixing coverity CID #499615 */
                     goto bypass_end_of_INChI_plain;
                 }
             }
@@ -907,6 +906,11 @@ int InchiToInpAtom( INCHI_IOSTREAM *inp_file,
                 num_atoms = INCHI_INP_ERROR_RET; /* error */
                 *err = INCHI_INP_ERROR_ERR;
                 TREAT_ERR(*err, 0, "Missing bonds data");
+                if (atom) /* djb-rwth: fixing coverity CID #499615 */
+                {
+                    inchi_free(atom);
+                    atom = NULL;
+                }
                 goto bypass_end_of_INChI_plain;
             }
             else