From f0b9742f41e6cd15fc1ac09cab37e7b50ea10761 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 11 Sep 2018 07:20:22 -1100
Subject: [PATCH] Test

---
 src/cc/dapps/oraclefeed.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/cc/dapps/oraclefeed.c b/src/cc/dapps/oraclefeed.c
index 729ad8ab5..cbef4b8ee 100644
--- a/src/cc/dapps/oraclefeed.c
+++ b/src/cc/dapps/oraclefeed.c
@@ -374,8 +374,8 @@ bits256 get_KMDblockhash(int32_t height)
     }
     else if ( retstr != 0 )
     {
-        fprintf(stderr,"get_KMDblockhash.(%s)\n",retstr);
-        if ( strlen(retstr) == 64 )
+        fprintf(stderr,"get_KMDblockhash.(%s) %d\n",retstr,(int32_t)strlen(retjson));
+        if ( strlen(retstr) >= 64 )
             decode_hex(hash.bytes,32,retstr);
         free(retstr);
     }
@@ -409,9 +409,15 @@ int32_t get_KMDheader(bits256 *blockhashp,bits256 *merklerootp,int32_t prevheigh
     if ( height > 0 )
     {
         *blockhashp = get_KMDblockhash(height);
-        *merklerootp = get_KMDmerkleroot(*blockhashp);
-        return(height);
+        if ( bits256_nonz(*blockhashp) != 0 )
+        {
+            *merklerootp = get_KMDmerkleroot(*blockhashp);
+            if ( bits256_nonz(*merklerootp) != 0 )
+                return(height);
+        }
     }
+    memset(blockhashp,0,sizeof(*blockhashp));
+    memset(merklerootp,0,sizeof(*merklerootp));
     return(0);
 }