This commit is contained in:
Mihailo Milenkovic
2018-10-30 16:33:42 +01:00
parent 1a7c26f2b7
commit af65dcfbb9

View File

@@ -777,8 +777,7 @@ int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinadd
{ {
for (i=0; i<numarray; i++) for (i=0; i<numarray; i++)
{ {
vout = jitem(vouts,i); if ((vout = jitem(vouts,i)) !=0 && (sobj= jobj(vout,"scriptPubKey")) != 0 )
if ( (sobj= jobj(vout,"scriptPubKey")) != 0 )
{ {
if ( (addresses= jarray(&n,sobj,"addresses")) != 0 ) if ( (addresses= jarray(&n,sobj,"addresses")) != 0 )
{ {
@@ -819,8 +818,7 @@ int32_t markerfromthisnode(char *refcoin,char *acname,char *coinaddr)
n=cJSON_GetArraySize(array); n=cJSON_GetArraySize(array);
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
item = jitem(array,i); if ((item=jitem(array,i))!=0 && (bits256_nonz(tmptxid=jbits256(item,"txid")))!=0 && (rawtx=get_rawtransaction(refcoin,acname,tmptxid))!=0 && (vins=jarray(&m,rawtx,"vin"))!=0)
if ((bits256_nonz(tmptxid=jbits256(item,"txid")))!=0 && (rawtx=get_rawtransaction(refcoin,acname,tmptxid))!=0 && (vins=jarray(&m,rawtx,"vin"))!=0)
{ {
for (int j=0;j<m;j++) for (int j=0;j<m;j++)
{ {
@@ -830,11 +828,12 @@ int32_t markerfromthisnode(char *refcoin,char *acname,char *coinaddr)
break; break;
} }
} }
free_json(array);
} }
if (num==1) break; if (num==1) break;
} }
} else return(-1); free_json(array);
}
else return(-1);
if ( num == 0 ) if ( num == 0 )
{ {
if ( (array= get_rawmempool(refcoin,acname)) != 0 ) if ( (array= get_rawmempool(refcoin,acname)) != 0 )