Merge branch 'master' into ubuntu20

libzafl @ 26f4b47d

-Subproject commit 00c68e321254563930443f3dbd34fbe6248dba77
+Subproject commit 26f4b47da6575fe4abd9df3f15e6bde6d316c588

tools/SConstruct

@@ -20,12 +20,12 @@ env.Replace(IRDB_LIBS=os.environ['IRDB_LIBS'])
 env.Replace(debug=ARGUMENTS.get("debug",0))
 
 if int(env['debug']) == 1:
-        print "Setting debug mode"
+        print("Setting debug mode")
         env.Append(CFLAGS=" -g ")
         env.Append(CXXFLAGS=" -g ")
         env.Append(LINKFLAGS=" -g ")
 else:
-        print "Setting release mode"
+        print("Setting release mode")
         env.Append(CFLAGS=" -O3 ")
         env.Append(CXXFLAGS=" -O3 ")
         env.Append(LINKFLAGS=" -O3 ")

tools/laf/laf_driver.cpp

@@ -150,7 +150,7 @@ int main(int argc, char **argv)
 				cout<<"Skipping (no changes) "<<this_file->getURL()<<endl;
 			}
 		}
-		catch (DatabaseError_t pnide)
+		catch (const DatabaseError_t &pnide)
 		{
 			cerr << programName << ": Unexpected database error: " << pnide << "file url: " << this_file->getURL() << endl;
 			exit(1);

tools/zax/zax_driver.cpp

@@ -343,7 +343,7 @@ int main(int argc, char **argv)
 				cout<<"Skipping (no changes) "<<this_file->getURL()<<endl;
 			}
 		}
-		catch (const DatabaseError_t pnide)
+		catch (const DatabaseError_t &pnide)
 		{
 			cerr << programName << ": Unexpected database error: " << pnide << "file url: " << this_file->getURL() << endl;
 			exit(1);