From cefd03899ff49e0104095db3b9f20e643d0be0b0 Mon Sep 17 00:00:00 2001
From: Anton Kochkov <anton.kochkov@gmail.com>
Date: Fri, 2 Apr 2021 15:55:32 +0800
Subject: [PATCH] Remove some exit() calls from librz/ (#954)

---
 librz/crypto/p/crypto_serpent_algo.c | 11 +++--------
 librz/egg/egg_lang.c                 |  8 +++++---
 librz/egg/rlcc/rlcc.c                |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/librz/crypto/p/crypto_serpent_algo.c b/librz/crypto/p/crypto_serpent_algo.c
index 3840785d08..664c3f2f90 100644
--- a/librz/crypto/p/crypto_serpent_algo.c
+++ b/librz/crypto/p/crypto_serpent_algo.c
@@ -1,4 +1,5 @@
 #include "crypto_serpent_algo.h"
+#include <rz_util/rz_assert.h>
 
 static const ut8 S[][16] = {
 	{ 3, 8, 15, 1, 10, 6, 5, 11, 14, 13, 4, 2, 7, 0, 9, 12 }, /* S0: */
@@ -64,10 +65,7 @@ static inline ut8 apply_sbox_inv(int si, ut8 x) {
 }
 
 static inline ut8 get_bit(int i, ut32 input) {
-	if (i >= 32) {
-		eprintf("Wrong bit asked");
-		exit(1);
-	}
+	rz_return_val_if_fail(i < 32, 0);
 	return (input >> i) & 1;
 }
 
@@ -91,10 +89,7 @@ void apply_FP(ut32 in[DW_BY_BLOCK], ut32 out[DW_BY_BLOCK]) {
 
 void serpent_keyschedule(struct serpent_state st,
 	ut32 subkeys[NB_SUBKEYS * DW_BY_BLOCK]) {
-	if ((st.key_size != 128) && (st.key_size != 192) && (st.key_size != 256)) {
-		eprintf("Invalid key size");
-		exit(1);
-	}
+	rz_return_if_fail((st.key_size == 128) || (st.key_size == 192) || (st.key_size == 256));
 
 	ut32 tmpkeys[DW_BY_BLOCK * NB_SUBKEYS + DW_BY_USERKEY] = { 0 };
 	const ut32 phi = 0x9e3779b9;
diff --git a/librz/egg/egg_lang.c b/librz/egg/egg_lang.c
index f94724af2e..0d77e2b7be 100644
--- a/librz/egg/egg_lang.c
+++ b/librz/egg/egg_lang.c
@@ -1049,7 +1049,8 @@ static void rcc_next(RzEgg *egg) {
 		if (!strcmp(str, "while")) {
 			char var[128];
 			if (egg->lang.lastctxdelta >= 0) {
-				exit(eprintf("ERROR: Unsupported while syntax\n"));
+				eprintf("ERROR: Unsupported while syntax\n");
+				return;
 			}
 			sprintf(var, "__begin_%d_%d_%d\n", egg->lang.nfunctions, CTX, egg->lang.nestedi[CTX - 1]);
 			e->while_end(egg, var); // get_frame_label (1));
@@ -1292,9 +1293,10 @@ RZ_API int rz_egg_lang_parsechar(RzEgg *egg, char c) {
 	}
 	if (egg->lang.slurp) {
 		if (egg->lang.slurp != '"' && c == egg->lang.slurpin) { // only happend when (...(...)...)
-			exit(eprintf(
+			eprintf(
 				"%s:%d Nesting of expressions not yet supported\n",
-				egg->lang.file, egg->lang.line));
+				egg->lang.file, egg->lang.line);
+			return -1;
 		}
 		if (c == egg->lang.slurp && egg->lang.oc != '\\') { // close egg->lang.slurp
 			egg->lang.elem[egg->lang.elem_n] = '\0';
diff --git a/librz/egg/rlcc/rlcc.c b/librz/egg/rlcc/rlcc.c
index 946f36a5fd..4711c6bec7 100644
--- a/librz/egg/rlcc/rlcc.c
+++ b/librz/egg/rlcc/rlcc.c
@@ -191,7 +191,7 @@ int main(int argc, char **argv) {
 	if (err != NULL) {
 		mpc_err_print(err);
 		mpc_err_delete(err);
-		exit(1);
+		return -1;
 	}
 
 #if 1