From 86e121ecdac62f998a9ef4722708ff6a90736486 Mon Sep 17 00:00:00 2001
From: Artem Pikulin <ortgma@gmail.com>
Date: Wed, 7 Mar 2018 19:36:11 +0700
Subject: [PATCH] Add NULL checks when ETH txs are sent.

---
 iguana/exchanges/LP_etomic.c   |  1 -
 iguana/exchanges/LP_remember.c | 30 +++++++++++++++++++++++++-----
 iguana/exchanges/LP_swap.c     |  9 +++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/iguana/exchanges/LP_etomic.c b/iguana/exchanges/LP_etomic.c
index b3b0e6a61..9712f414d 100644
--- a/iguana/exchanges/LP_etomic.c
+++ b/iguana/exchanges/LP_etomic.c
@@ -561,7 +561,6 @@ char *LP_etomicalice_spends_bob_payment(struct LP_swap_remember *swap)
     strcpy(txData.to, ETOMIC_BOBCONTRACT);
     strcpy(txData.amount, "0");
     uint8arrayToHex(txData.secretKey, privkey.bytes, 32);
-    printf("priv key: %s", txData.secretKey);
     return aliceSpendsBobPayment(input, txData);
 }
 
diff --git a/iguana/exchanges/LP_remember.c b/iguana/exchanges/LP_remember.c
index 09ddbfa21..dabd3625a 100644
--- a/iguana/exchanges/LP_remember.c
+++ b/iguana/exchanges/LP_remember.c
@@ -1256,7 +1256,11 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
                                 if ( rswap.bobtomic[0] != 0 )
                                 {
                                     char *aliceSpendEthTxId = LP_etomicalice_spends_bob_payment(&rswap);
-                                    free(aliceSpendEthTxId);
+                                    if (aliceSpendEthTxId != NULL) {
+                                        free(aliceSpendEthTxId);
+                                    } else {
+                                        printf("Alice spend ETH tx send failed!\n");
+                                    }
                                 }
 #endif
                             }
@@ -1301,7 +1305,11 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
                                 if ( rswap.bobtomic[0] != 0 )
                                 {
                                     char *aliceClaimsEthTxId = LP_etomicalice_claims_bob_deposit(&rswap);
-                                    free(aliceClaimsEthTxId);
+                                    if (aliceClaimsEthTxId != NULL) {
+                                        free(aliceClaimsEthTxId);
+                                    } else {
+                                        printf("Alice Bob deposit claim ETH tx failed!\n");
+                                    }
                                 }
 #endif
                             }
@@ -1373,7 +1381,11 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
                                 if ( rswap.alicetomic[0] != 0 )
                                 {
                                     char *bobSpendEthTx = LP_etomicbob_spends_alice_payment(&rswap);
-                                    free(bobSpendEthTx);
+                                    if (bobSpendEthTx != NULL) {
+                                        free(bobSpendEthTx);
+                                    } else {
+                                        printf("Bob spends Alice payment ETH tx send failed!\n");
+                                    }
                                 }
 #endif
                                 //printf("bobspend.(%s)\n",rswap.txbytes[BASILISK_BOBSPEND]);
@@ -1406,7 +1418,11 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
                             if ( rswap.bobtomic[0] != 0 )
                             {
                                 char *bobReclaimEthTx = LP_etomicbob_reclaims_payment(&rswap);
-                                free(bobReclaimEthTx);
+                                if (bobReclaimEthTx != NULL) {
+                                    free(bobReclaimEthTx);
+                                } else {
+                                    printf("Bob reclaims payment ETH tx send failed!\n");
+                                }
                             }
 #endif
                             //int32_t z;
@@ -1448,7 +1464,11 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
                             if ( rswap.bobtomic[0] != 0 )
                             {
                                 char *bobRefundsEthTx = LP_etomicbob_refunds_deposit(&rswap);
-                                free(bobRefundsEthTx);
+                                if (bobRefundsEthTx != NULL) {
+                                    free(bobRefundsEthTx);
+                                } else {
+                                    printf("Bob refunds deposit ETH tx send failed!\n");
+                                }
                             }
 #endif
                             //printf("pubB1.(%s) bobrefund.(%s)\n",bits256_str(str,rswap.pubB1),rswap.txbytes[BASILISK_BOBREFUND]);
diff --git a/iguana/exchanges/LP_swap.c b/iguana/exchanges/LP_swap.c
index eb64f09f9..4fb1012f0 100644
--- a/iguana/exchanges/LP_swap.c
+++ b/iguana/exchanges/LP_swap.c
@@ -721,8 +721,13 @@ uint32_t LP_swapdata_rawtxsend(int32_t pairsock,struct basilisk_swap *swap,uint3
                 if ( swap->I.bobtomic[0] != 0 || swap->I.alicetomic[0] != 0 )
                 {
                     char *ethTxId = sendEthTx(swap, rawtx);
-                    strcpy(rawtx->I.ethTxid, ethTxId);
-                    free(ethTxId);
+                    if (ethTxId != NULL) {
+                        strcpy(rawtx->I.ethTxid, ethTxId);
+                        free(ethTxId);
+                    } else {
+                        printf("Error sending ETH tx\n");
+                        return(-1);
+                    }
                 }
 #endif
                 sendlen = 0;