From 4256ad0acbb793814ac79c6efe5715daad8ff540 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Fri, 13 Sep 2019 17:28:00 -0700
Subject: Several suggested bug-fixes.

---
 src/base/abc/abcFanOrder.c | 2 +-
 src/base/abci/abc.c        | 2 +-
 src/sat/bmc/bmcFault.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/base/abc/abcFanOrder.c b/src/base/abc/abcFanOrder.c
index 8e2ed10d..12df7d85 100644
--- a/src/base/abc/abcFanOrder.c
+++ b/src/base/abc/abcFanOrder.c
@@ -550,7 +550,7 @@ static inline int Abc_CubeContain( char * pCube1, char * pCube2, int nVars )
             fCont12 = 0;
         else
             return 0;
-        if ( !fCont21 && !fCont21 )
+        if ( !fCont12 && !fCont21 )
             return 0;
     }
     assert( fCont21 || fCont12 );
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 3eafcfb9..43ef2ec7 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -4105,7 +4105,7 @@ int Abc_CommandCleanup( Abc_Frame_t * pAbc, int argc, char ** argv )
     }
     if ( Abc_NtkIsStrash(pNtk) )
     {
-        if ( !fCleanupPos && !fCleanupPos )
+        if ( !fCleanupPis && !fCleanupPos )
         {
             Abc_Print( -1, "Cleanup for PIs and POs is not enabled.\n" );
             pNtkRes = Abc_NtkDup( pNtk );
diff --git a/src/sat/bmc/bmcFault.c b/src/sat/bmc/bmcFault.c
index 1b54dc73..bb4057e0 100644
--- a/src/sat/bmc/bmcFault.c
+++ b/src/sat/bmc/bmcFault.c
@@ -649,7 +649,7 @@ int Gia_FormStrCount( char * pStr, int * pnVars, int * pnPars )
     }
     if ( *pnVars != FFTEST_MAX_VARS )
         { printf( "The number of input variables (%d) should be 2\n", *pnVars ); return 1; }
-    if ( *pnPars < 1 && *pnPars > FFTEST_MAX_PARS )
+    if ( *pnPars < 1 || *pnPars > FFTEST_MAX_PARS )
         { printf( "The number of parameters should be between 1 and %d\n", *pnPars ); return 1; }
     return 0;
 }
-- 
cgit v1.2.3